Browse Source

[FIX] Statement Cancel

adrielso 6 years ago
parent
commit
d7f18fe867
2 changed files with 27 additions and 20 deletions
  1. 25 19
      models/cashbox_statement_cancel.py
  2. 2 1
      static/src/js/eiru_statement_cancel.js

+ 25 - 19
models/cashbox_statement_cancel.py

@@ -175,27 +175,33 @@ class eiru_account_statement_cancel(models.Model):
         '''
             Confirm
         '''
-        cashBoxConfirm = self._eiru_account_get_cashbox_confirm(statement.id)
-        if (not cashBoxConfirm):
-            return {
-                'state': False,
-                'messege': "Error en obtener el registro de cierre de caja. ref(cashbox.statement.confirm)."
-            }
+        statementOpen = []
+        stateOpen   = []
+        lineDifference = []
+        lineNextOpen = []
+        lineOpen = []
 
-        statementOpen = self._eiru_get_account_bank_statement(cashBoxConfirm.statement_open.id)
-        if (statementOpen and statementOpen.state =='confirm'):
-            return {
-                'state': False,
-                'messege': "No se puede reabrir esta caja porque  tiene relación a una caja que ya esta cerrada."
-            }
+        cashBoxConfirm = self._eiru_account_get_cashbox_confirm(statement.id)
+        # if (not cashBoxConfirm):
+        #     return {
+        #         'state': False,
+        #         'messege': "Error en obtener el registro de cierre de caja. ref(cashbox.statement.confirm)."
+        #     }
+        if (cashBoxConfirm):
+            statementOpen = self._eiru_get_account_bank_statement(cashBoxConfirm.statement_open.id)
+            if (statementOpen and statementOpen.state =='confirm'):
+                return {
+                    'state': False,
+                    'messege': "No se puede reabrir esta caja porque  tiene relación a una caja que ya esta cerrada."
+                }
 
-        stateOpen = statementOpen.state
-        # Line Diferencia
-        lineDifference = self._eiru_get_account_bank_statement_line(cashBoxConfirm.line_difference.id)
-        # line Next Open
-        lineNextOpen = self._eiru_get_account_bank_statement_line(cashBoxConfirm.line_next_open.id)
-        # Line Open
-        lineOpen = self._eiru_get_account_bank_statement_line(cashBoxConfirm.line_open.id)
+            stateOpen = statementOpen.state
+            # Line Diferencia
+            lineDifference = self._eiru_get_account_bank_statement_line(cashBoxConfirm.line_difference.id)
+            # line Next Open
+            lineNextOpen = self._eiru_get_account_bank_statement_line(cashBoxConfirm.line_next_open.id)
+            # Line Open
+            lineOpen = self._eiru_get_account_bank_statement_line(cashBoxConfirm.line_open.id)
 
         '''
             Cancel statement

+ 2 - 1
static/src/js/eiru_statement_cancel.js

@@ -149,7 +149,8 @@
             var currency = statement.currencystatement;
             if (!currency)
                 return confirm;
-
+            if (!statement.statementConfirm.length)
+                return lineConfirm;
             /* Reserve */
             _.each(statement.statementConfirm[0].lineNextOpen, function(line){
                 lineConfirm.push({