pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] improved bank statement view

Browse Source 
bzr revid: bde@tinyerp.com-20120627114428-t1wtl2fkbfhedvj0
This commit is contained in:
Bharat Devnani (OpenERP)
2012-06-27 17:14:28 +05:30
parent 4bd5a1f28f
commit 0fd39ebd7e
6 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_view.xml
+15 -4
View File
@@ -598,14 +598,25 @@
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
</header>
<sheet>
<div class="oe_right oe_button_box_new" name="import_buttons">
</div>
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name" class="oe_inline"/>-
<field name="period_id" class="oe_inline"/>
</h1>
<label for="journal_id" class="oe_edit_only"/>
<h2>
<field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>
</h2>
<group>
<group>
<field name="name"/>
<field name="date" on_change="onchange_date(date, company_id)"/>
<field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>
<field name="period_id"/>
<field name='company_id' widget="selection" groups="base.group_multi_company" />
</group><group>
</group>
<group>
<field name="balance_start"/>
<field name="balance_end_real"/>
<field name="currency" invisible="1"/>
addons/account_payment/account_payment_view.xml
+3 -3
View File
@@ -330,9 +330,9 @@
<field name="type">form</field>
<field name="inherit_id" ref="account.view_bank_statement_form"/>
<field name="arch" type="xml">
<field name="journal_id" position="after">
<button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import payment lines" type="action" icon="gtk-execute"/>
</field>
<xpath expr="//div[@name='import_buttons']" position="inside">
<button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Payment Lines" type="action" icon="gtk-execute"/>
</xpath>
</field>
</record>
addons/account_payment/wizard/account_payment_populate_statement_view.xml
-1
View File
@@ -10,7 +10,6 @@
<form string="Populate Statement:" version="7.0">
<header>
<button name="populate_statement" string="ADD" type="object" icon="gtk-ok"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
</header>
<field name="lines"/>
</form>
addons/account_voucher/account_voucher_view.xml
+3 -3
View File
@@ -206,11 +206,11 @@
<field name="type">form</field>
<field name="inherit_id" ref="account.view_bank_statement_form"/>
<field name="arch" type="xml">
<field name="currency" invisible="1" position="after">
<button name="%(action_view_account_statement_from_invoice_lines)d"
<xpath expr="//div[@name='import_buttons']" position="inside">
<button name="%(action_view_account_statement_from_invoice_lines)d"
string="Import Invoices" type="action" icon="gtk-execute"
attrs="{'invisible':[('state','=','confirm')]}"/>
</field>
</xpath>
</field>
</record>
addons/account_voucher/wizard/account_statement_from_invoice_view.xml
-1
View File
@@ -42,7 +42,6 @@
</group>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-execute" string="Ok" name="populate_statement" type="object"/>
</group>
</form>
addons/l10n_ch/wizard/bvr_import_view.xml
+3 -4
View File
@@ -10,7 +10,6 @@
<form string="BVR Import" version="7.0">
<header>
<button name="import_bvr" string="Import" type="object" icon="gtk-ok" colspan="2"/>
<button special="cancel" string="Cancel" icon="gtk-cancel" colspan="2"/>
</header>
<group>
<field name="file"/>
@@ -35,9 +34,9 @@
<field name="type">form</field>
<field name="inherit_id" ref="account.view_bank_statement_form"/>
<field name="arch" type="xml">
<field name="balance_end_real" position="after">
<button name="%(wizard_bvr_import)d" icon="gtk-execute" string="Import BVR" type="action" colspan="2"/>
</field>
<xpath expr="//div[@name='import_buttons']" position="inside">
<button name="%(wizard_bvr_import)d" icon="gtk-execute" string="Import BVR" type="action"/>
</xpath>
</field>
</record>
</data>