Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-bank-statement-bde
into lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-bank-statement-bde/+merge/112548
Hello Sir,
I have improved Bank Statement view.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-bank-statement-bde/+merge/112548
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-bank-statement-bde
into lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp.
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2012-06-27 17:56:06 +0000
+++ account/account_view.xml 2012-06-28 12:05:36 +0000
@@ -605,14 +605,25 @@
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
</header>
<sheet>
+
+ <div class="oe_right oe_button_box" 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"/>
=== modified file 'account_payment/account_payment_view.xml'
--- account_payment/account_payment_view.xml 2012-06-27 10:12:27 +0000
+++ account_payment/account_payment_view.xml 2012-06-28 12:05:36 +0000
@@ -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>
=== modified file 'account_payment/wizard/account_payment_populate_statement_view.xml'
--- account_payment/wizard/account_payment_populate_statement_view.xml 2012-06-09 14:13:14 +0000
+++ account_payment/wizard/account_payment_populate_statement_view.xml 2012-06-28 12:05:36 +0000
@@ -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>
=== modified file 'account_voucher/account_voucher_view.xml'
--- account_voucher/account_voucher_view.xml 2012-06-28 10:55:03 +0000
+++ account_voucher/account_voucher_view.xml 2012-06-28 12:05:36 +0000
@@ -223,11 +223,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>
=== modified file 'account_voucher/wizard/account_statement_from_invoice_view.xml'
--- account_voucher/wizard/account_statement_from_invoice_view.xml 2011-01-14 00:11:01 +0000
+++ account_voucher/wizard/account_statement_from_invoice_view.xml 2012-06-28 12:05:36 +0000
@@ -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>
=== modified file 'l10n_ch/wizard/bvr_import_view.xml'
--- l10n_ch/wizard/bvr_import_view.xml 2012-06-09 22:28:49 +0000
+++ l10n_ch/wizard/bvr_import_view.xml 2012-06-28 12:05:36 +0000
@@ -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>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
