Pankita Shah(OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-accounting-view-imp-atp-improve-journal-vouchers-shp
into lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp.
Requested reviews:
Atul Patel(OpenERP) (atp-openerp)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-accounting-view-imp-atp-improve-journal-vouchers-shp/+merge/112499
Hello,
I improve journal voucher view.
Thanks
shp
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-accounting-view-imp-atp-improve-journal-vouchers-shp/+merge/112499
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp.
=== modified file 'account_voucher/account_voucher_view.xml'
--- account_voucher/account_voucher_view.xml 2012-06-26 10:01:34 +0000
+++ account_voucher/account_voucher_view.xml 2012-06-28 07:04:32 +0000
@@ -50,16 +50,27 @@
<field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
</header>
<sheet string="Accounting Voucher">
- <group col="6" colspan="4">
- <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
- <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
- <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
- <field name="type" required="1"/>
- <field name="name" colspan="2"/>
- <field name="company_id" widget="selection" groups="base.group_multi_company"/>
- <field name="reference"/>
- <field name="account_id" widget="selection" invisible="True"/>
- </group>
+ <h1>
+ <label for="number"/>
+ <field name="number" class="oe_inline"/>
+ <span attr="{'invisible': [('type','=',False)]}" class="oe_inline"> ( </span>
+ <field name="type" required="1" class="oe_inline"/>
+ <span attr="{'invisible': [('type','=',False)]}" class="oe_inline"> ) </span>
+ </h1>
+ <group>
+ <group>
+ <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+ <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
+ <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+ </group>
+ <group>
+ <field name="currency_id"/>
+ <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+ <field name="reference"/>
+ <field name="name"/>
+ </group>
+ </group>
+ <field name="account_id" widget="selection" invisible="True"/>
<notebook colspan="4">
<page string="Voucher Entry">
<field name="line_ids" on_change="onchange_price(line_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
@@ -71,22 +82,25 @@
<field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
</tree>
</field>
- <group col="3">
+ <group col="3">
+ <div>
<group string="Internal Notes">
- <field name="narration" colspan="2" nolabel="1"/>
- </group>
- <group string="Other Information">
- <field name="number"/>
- <field name="currency_id"/>
- </group>
- <group col="4" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}">
- <separator string="Total" colspan="4"/>
- <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
- <field name="tax_amount" nolabel="1"/>
- <button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
- <label colspan="1" string=""/><field name="amount" string="Total"/>
- </group>
- </group>
+ <field name="narration" colspan="2" nolabel="1" placeholder="Add an internal notes "/>
+ </group>
+ <button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
+ </div>
+ <group>
+ <group attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" class="oe_subtotal_footer oe_right">
+ <group>
+ <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
+ </group>
+ <group>
+ <field name="tax_amount"/>
+ <field name="amount" class="oe_subtotal_footer_separator"/>
+ </group>
+ </group>
+ </group>
+ </group>
</page>
<page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
<group col="4">
_______________________________________________
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
