Procházet zdrojové kódy

[FIX] Api Modificado el método de consulta de caja

adrielso před 6 roky
rodič
revize
79c2dcbb3f

+ 30 - 55
controllers/account_bank_statement.py

@@ -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):

+ 25 - 3
controllers/account_bank_statement_line.py

@@ -6,10 +6,32 @@ from eiru_logging import make_info_log
 
 _MODEL= 'account.bank.statement.line'
 
+''' Get Line statement '''
+def get_line_statement(statementId):
+    lines= '''
+        SELECT
+            line.id as id,
+            line.date,
+            line.name,
+            line.ref,
+            line.amount,
+            line.partner_id
+        FROM account_bank_statement_line as line
+        WHERE line.statement_id = %s
+    '''
+    request.cr.execute(lines,[statementId])
 
-'''
-    Create Statement line
-'''
+    return [{
+        'id': line[0],
+        'date': line[1],
+        'name': line[2],
+        'ref': line[3],
+        'amount': line[4],
+        'partnerId': line[5],
+    } for line in  request.cr.fetchall()]
+
+
+''' Create Statement line '''
 def create_statement_line(values):
     return request.env[_MODEL].sudo().create(values)
 

+ 1 - 0
controllers/main.py

@@ -120,6 +120,7 @@ class Statement(http.Controller):
         from account_bank_statement import create_account_bank_statement
 
         return create_account_bank_statement(kw.get('data'))
+
     '''
          ██████ ██       ██████  ███████ ██ ███    ██  ██████
         ██      ██      ██    ██ ██      ██ ████   ██ ██

+ 1 - 1
webpack.config.js

@@ -66,5 +66,5 @@ module.exports = {
                 }
             }
         ]
-    }
+    },
 }