Browse Source

[FIX] Open Cashbox

adrielso 6 years ago
parent
commit
a0707f5830

+ 9 - 14
models/account_bank_statement_utility.py

@@ -616,17 +616,17 @@ class AccountBankStatementUtility(models.Model):
         } for open in self.env['account.bank.statement'].search([('journal_id.id', '=',statement.journal_id.id),('type_statement.id', '=', statement.type_statement.id),('user_id.id', '=', statement.user_id.id),('state', '=', 'open')])]
 
 
-    '''    ___                      ____          _     ____
-          / _ \ _ __   ___ _ __    / ___|__ _ ___| |__ | __ )  _____  __
-         | | | | '_ \ / _ \ '_ \  | |   / _` / __| '_ \|  _ \ / _ \ \/ /
-         | |_| | |_) |  __/ | | | | |__| (_| \__ \ | | | |_) | (_) >  <
-          \___/| .__/ \___|_| |_|  \____\__,_|___/_| |_|____/ \___/_/\_\
-               |_|
+    '''
+        Open cashBox
     '''
     @api.model
     def account_bank_statement_open_cashbox(self, id):
         statement = self._get_statement_transfer(id)
+        return statement.button_open()
 
+    @api.model
+    def account_bank_statement_open(self, id):
+        statement = self._get_statement_transfer(id)
         cashBoxConfirm = self._get_cashbox_statement_confirm(statement)
         for casBox in cashBoxConfirm:
             name = "SALDO ANTERIOR /"+str(casBox.statement_id.name)
@@ -646,19 +646,13 @@ class AccountBankStatementUtility(models.Model):
 
             confirmCasBox = self._writer_cashbox_statement_confirm(confirmCasBox,values)
 
-
-        return statement.button_open()
+        return True
 
     '''
         get cashbox.statement.confirm
     '''
     def _get_cashbox_statement_confirm(self, statement):
-        return self.env['cashbox.statement.confirm'].search([   ('statement_id.type_statement.id', '=', statement.type_statement.id),
-                                                                ('user_statement', '=', statement.user_id.id),
-                                                                ('journal_id', '=', statement.journal_id.id),
-                                                                ('state_avaliable', '=', True),
-                                                                ('statement_id.id', '!=', statement.id)
-                                                            ])
+        return self.env['cashbox.statement.confirm'].search([('statement_id.type_statement.id', '=', statement.type_statement.id), ('user_statement', '=', statement.user_id.id), ('journal_id', '=', statement.journal_id.id), ('state_avaliable', '=', True), ('statement_id.id', '!=', statement.id)])
 
     '''
         writer casbox statement confirm
@@ -671,6 +665,7 @@ class AccountBankStatementUtility(models.Model):
     '''
     @api.multi
     def button_open(self):
+        self.account_bank_statement_open(self.id)
         return super(AccountBankStatementUtility, self).button_open()
 
 

+ 1 - 2
models/cashbox_statement_confirm.py

@@ -229,10 +229,9 @@ class AccountBankStatementConfirm(models.Model):
             'amount_difference': lineBalance.amount if (lineBalance) else 0.0,
             'line_next_open': lineNextOpen.id if(lineNextOpen) else '',
             'amount_next_open': abs(lineNextOpen.amount) if(lineNextOpen) else 0.0,
-            'state_avaliable': True if(lineNextOpen and lineNextOpen.amount > 0) else False,
+            'state_avaliable': True if(lineNextOpen and abs(lineNextOpen.amount) > 0) else False,
         }
 
-
         statementConfirm = self._create_cashbox_statement_confirm(cashboxConfirm, bankStatement)
         if (not statementConfirm):
             return {

+ 40 - 0
static/src/js/eiru_statement_init.js

@@ -0,0 +1,40 @@
+(function() {
+    openerp.widgetInstanceStatementInit = null;
+    openerp.parentInstanceStatementInit = {};
+    var QWeb = openerp.web.qweb;
+    var instanceWeb = openerp.web;
+    // Abrir caja
+    openerp.EiruStatementInit = openerp.Widget.extend({
+        id: undefined,
+        sidebar: undefined,
+        /* init */
+        init: function(parent) {
+            this._super(parent);
+            this.sidebar = parent.$sidebar;
+        },
+        /* Actualizar Id de la visat actual  */
+        updateId: function() {
+            var self = this;
+            this.sidebar.css('display', 'none')
+        },
+    });
+
+    if (openerp.web && openerp.web.FormView) {
+        openerp.web.FormView.include({
+            load_record: function(record) {
+                this._super.apply(this, arguments);
+
+                if (this.model !== 'account.bank.statement')
+                    return;
+
+                openerp.parentInstanceStatementInit = this;
+                if (openerp.widgetInstanceStatementInit) {
+                    openerp.widgetInstanceStatementInit.updateId();
+                    return ;
+                }
+                openerp.widgetInstanceStatementInit = new openerp.EiruStatementInit(this);
+                openerp.widgetInstanceStatementInit.updateId();
+            }
+        });
+    }
+})();

+ 3 - 0
static/src/js/modal_statement_line_unlink.js

@@ -9,6 +9,7 @@
         template: 'EiruStatementUtility.LineUnlink',
         id: undefined,
         buttons: undefined,
+        // sidebar: undefined,
         bankStatement: [],
         resUser: [],
         statementConfig: [],
@@ -17,9 +18,11 @@
         init: function(parent) {
             this._super(parent);
             this.buttons = parent.$buttons;
+            // this.sidebar = parent.$sidebar;
         },
         /* start */
         start: function () {
+            // this.sidebar.css('display','none')
             var self = this
             this.$el.click(function() {
                 // self.fetchInitial();

+ 2 - 0
views/template.xml

@@ -3,6 +3,8 @@
         <template id="eiru_account_bank_statement_utility.eiru_assets" name="eiru_account_bank_statement_utility_assets" inherit_id="eiru_assets.assets">
             <xpath expr="." position="inside">
                 <link rel="stylesheet" href="/eiru_account_bank_statement_utility/static/src/css/style.css"/>
+                <!-- Initial  -->
+                <script type="text/javascript" src="/eiru_account_bank_statement_utility/static/src/js/eiru_statement_init.js"/>
                 <!-- transferencia -->
                 <script type="text/javascript" src="/eiru_account_bank_statement_utility/static/src/js/eiru_statement_transfer.js"/>
                 <script type="text/javascript" src="/eiru_account_bank_statement_utility/static/src/js/eiru_statement_transfer_deleted.js"/>