|
@@ -25,66 +25,41 @@ def search_account_bank_statement(statementId):
|
|
|
''' account.bank.statement all'''
|
|
|
def get_account_bank_statement( journalIds=None):
|
|
|
make_info_log('GET Account Bank Statement all ')
|
|
|
+ from account_bank_statement_line import get_line_statement
|
|
|
|
|
|
if (not journalIds):
|
|
|
return False
|
|
|
- domain = [('journal_id.id', 'in', journalIds),('state', '=', 'open')]
|
|
|
- # domain = [('journal_id.id', 'in', journalIds), ('user_id', '=', request.env.user.id)]
|
|
|
+
|
|
|
+ statementSQL = '''
|
|
|
+ SELECT
|
|
|
+ statement.id,
|
|
|
+ statement.name,
|
|
|
+ statement.date,
|
|
|
+ statement.state,
|
|
|
+ statement.balance_end,
|
|
|
+ statement.user_id,
|
|
|
+ statement.journal_id,
|
|
|
+ statement.type_statement
|
|
|
+ FROM account_bank_statement as statement
|
|
|
+ WHERE statement.journal_id in %s
|
|
|
+ ORDER BY statement.id
|
|
|
+ '''
|
|
|
+ # WHERE statement.state = 'open' and statement.journal_id in %s
|
|
|
+ domainSQL = tuple(journalIds)
|
|
|
+
|
|
|
+ request.cr.execute(statementSQL,[domainSQL])
|
|
|
return [{
|
|
|
- 'id': statement.id,
|
|
|
- 'name': statement.name,
|
|
|
- 'date': statement.date,
|
|
|
- 'state': statement.state,
|
|
|
- 'balanceEnd': statement.balance_end,
|
|
|
- 'user': {
|
|
|
- 'id': statement.user_id.id,
|
|
|
- 'name': statement.user_id.name,
|
|
|
- 'displayName': statement.user_id.display_name
|
|
|
- },
|
|
|
+ 'id': statement[0],
|
|
|
+ 'name': statement[1],
|
|
|
+ 'date': statement[2],
|
|
|
+ 'state': statement[3],
|
|
|
+ 'balanceEnd': statement[4],
|
|
|
+ 'userId': statement[5],
|
|
|
+ 'journalId': statement[6],
|
|
|
+ 'typeStatementId': statement[7],
|
|
|
'userSession': request.env.user.id,
|
|
|
- 'journal': {
|
|
|
- 'id': statement.journal_id.id,
|
|
|
- 'name': statement.journal_id.name,
|
|
|
- 'displayName': statement.journal_id.display_name,
|
|
|
- 'code': statement.journal_id.code,
|
|
|
- 'cashControl': statement.journal_id.cash_control,
|
|
|
- 'type': statement.journal_id.type,
|
|
|
- 'currency': {
|
|
|
- 'id': statement.journal_id.currency.id,
|
|
|
- 'name': statement.journal_id.currency.name,
|
|
|
- 'displayName': statement.journal_id.currency.display_name
|
|
|
- }
|
|
|
- },
|
|
|
- 'line': [{
|
|
|
- 'id': line.id,
|
|
|
- 'date': line.date,
|
|
|
- 'name': line.name,
|
|
|
- 'ref': line.ref,
|
|
|
- 'amount': line.amount,
|
|
|
- 'partnerId': line.partner_id.id,
|
|
|
- 'partner':[{
|
|
|
- 'id': partner.id,
|
|
|
- 'name': partner.name,
|
|
|
- 'ruc': partner.ruc,
|
|
|
- }for partner in request.env['res.partner'].browse(line.partner_id.id)],
|
|
|
- } for line in statement.line_ids],
|
|
|
- 'typeStatement': {
|
|
|
- 'id': statement.type_statement.id,
|
|
|
- 'name': statement.type_statement.name,
|
|
|
- 'code': statement.type_statement.code
|
|
|
- },
|
|
|
- 'currency': {
|
|
|
- 'id': statement.currency.id,
|
|
|
- 'name': statement.currency.display_name,
|
|
|
- 'base': statement.currency.base,
|
|
|
- 'symbol': statement.currency.symbol,
|
|
|
- 'position': statement.currency.position,
|
|
|
- 'rateSilent': statement.currency.rate_silent,
|
|
|
- 'decimalSeparator': statement.currency.decimal_separator,
|
|
|
- 'decimalPlaces': statement.currency.decimal_places,
|
|
|
- 'thousandsSeparator': statement.currency.thousands_separator
|
|
|
- }
|
|
|
- } for statement in request.env['account.bank.statement'].search(domain)]
|
|
|
+ 'lines': get_line_statement(statement[0]),
|
|
|
+ } for statement in request.cr.fetchall()]
|
|
|
|
|
|
'''Create Account Bank Statement '''
|
|
|
def create_account_bank_statement(data):
|