Explorar o código

[FIX] Cancelar Caja

adrielso %!s(int64=6) %!d(string=hai) anos
pai
achega
f3b04b74f7

+ 1 - 1
models/cashbox_statement_cancel.py

@@ -83,7 +83,7 @@ class eiru_account_statement_cancel(models.Model):
     '''
     @api.model
     def eiru_statement_cancel(self, id):
-        print("\n\neiru_statement_cancel\n\n")
+        # print("\n\neiru_statement_cancel\n\n")
         '''
         cashbox.statement.cancel
             name

+ 1 - 1
models/cashbox_statement_confirm.py

@@ -77,7 +77,7 @@ class cashbox_statement_confirm(models.Model):
             'userConfirmLogin': casBox.user_confirm.login,
             'amountStatement': casBox.amount_statement,
             'amountReal': casBox.amount_real,
-            'amountDifference': casBox.amount_difference,
+            'amountDifference': casBox.amount_difference if (casBox.amount_real >= casBox.amount_statement) else (-casBox.amount_difference),
             'amountNextOpen': casBox.amount_next_open,
             'transferCasBox': {
                 'id': casBox.casbox_transfer_id.id if(casBox.casbox_transfer_id) else '',

+ 3 - 3
static/src/xml/modal/modal_statement_cancel.xml

@@ -41,11 +41,11 @@
                                             </td>
                                             <td>
                                                 <t t-esc="line_value.statementUser"/>
-                                                <t t-set="state" t-value="line_value.statementState"/>
+                                                <!-- <t t-set="state" t-value="line_value.statementState"/>
                                                 <t t-js="ctx">
                                                     ctx.state = ctx.state === "open" ?"Abierta": "Cerrada";
                                                 </t>
-                                                <t t-esc="'('+state+')'"/>
+                                                <t t-esc="'('+state+')'"/> -->
                                             </td>
                                             <td>
                                                 <t t-esc="line_value.amount"/>
@@ -74,7 +74,7 @@
                                             <th class="oe_list_header_char oe_sortable">Fecha</th>
                                             <th class="oe_list_header_char oe_sortable">Caja</th>
                                             <th class="oe_list_header_char oe_sortable">valor</th>
-                                            <th class="oe_list_header_char oe_sortable">Obs</th>
+                                            <th class="oe_list_header_char oe_sortable">Referencia</th>
                                         </tr>
                                     </thead>
                                 </table>

+ 1 - 1
views/template.xml

@@ -19,7 +19,7 @@
                 <!-- print confirm -->
                 <script type="text/javascript" src="/eiru_account_bank_statement_utility/static/src/js/eiru_statement_confirm_print.js"/>
                 <!-- cancel statement -->
-                <script type="text/javascript" src="/eiru_account_bank_statement_utility/static/src/js/eiru_statement_cancel.js"/>
+                <!-- <script type="text/javascript" src="/eiru_account_bank_statement_utility/static/src/js/eiru_statement_cancel.js"/> -->
                 <!-- Importar Cajas -->
                 <!-- <script type="text/javascript" src="/eiru_account_bank_statement_utility/static/src/js/import_statement.js"/> -->
             </xpath>