瀏覽代碼

[FIX] view bank

adrielso 6 年之前
父節點
當前提交
710e97aa33
共有 2 個文件被更改,包括 21 次插入1 次删除
  1. 2 1
      models/account_bank_statement_utility.py
  2. 19 0
      views/eiru_statement_utility.xml

+ 2 - 1
models/account_bank_statement_utility.py

@@ -652,7 +652,8 @@ class AccountBankStatementUtility(models.Model):
         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)])
+        # 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

+ 19 - 0
views/eiru_statement_utility.xml

@@ -47,9 +47,28 @@
             <field name="model">account.bank.statement</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
 			<field name="arch" type="xml">
+				<!-- Utility cashbox -->
 				<field name='state' position="before">
 					<div class="eiru-statement-utility" attrs="{'invisible': [('state','!=','open')]}"></div>
 				</field>
+				<!--  Eliminar -->
+				<field name='state' position="before">
+					<div class="eiru-statement-unlink" attrs="{'invisible': [('state','==','confirm')]}"></div>
+				</field>
+				<!-- Cancel cashbox -->
+				<xpath expr="//button[@name='button_cancel']" position="replace">
+					<div class="eiru-statement-utility-cancel" attrs="{'invisible': [('state','!=','confirm')]}"></div>
+				</xpath>
+				<!-- Open cashbox -->
+				<xpath expr="//button[@name='button_confirm_bank']" position="replace">
+					<div class="eiru-statement-utility-open" states="draft"> </div>
+				</xpath>
+				<!-- Resume -->
+				<field name='state' position="before">
+					<div class="eiru-statement-print" attrs="{'invisible': [('state','!=','confirm')]}"></div>
+				</field>
+
+				<xpath expr="//button[@name='button_draft']" position="replace"></xpath>
             </field>
         </record>
 	</data>