odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE]:Merged lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-bank-statement-bde 

bzr revid: atp@tinyerp.com-20120628140454-j1qcm0kqpmi1r8uw
This commit is contained in:
Atul Patel (OpenERP) 2012-06-28 19:34:54 +05:30
parent de60ced366 87a8a5660f
commit 58bb82062c
6 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
addons/account/account_view.xml
View File

@ -605,14 +605,26 @@
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
</header>
<sheet>
<div class="oe_right oe_button_box" name="import_buttons">
<!-- Put here related buttons -->
</div>
<div class="oe_title">
<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>
</div>
<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"/>

6
addons/account_payment/account_payment_view.xml
View File

@ -335,9 +335,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>

1
addons/account_payment/wizard/account_payment_populate_statement_view.xml
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>

6
addons/account_voucher/account_voucher_view.xml
View File

@ -224,11 +224,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>

1
addons/account_voucher/wizard/account_statement_from_invoice_view.xml
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>

7
addons/l10n_ch/wizard/bvr_import_view.xml
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>