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

[MERGE]: Merged lp:~openerp-commiter/openobject-addons/trunk-accounting-view-imp-atp-improve-journal-vouchers-shp 

bzr revid: atp@tinyerp.com-20120628105503-70a0uk60p42qxxqo
This commit is contained in:
Atul Patel (OpenERP) 2012-06-28 16:25:03 +05:30
parent af763c0e63 0c79769943
commit 913d68112b
1 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
addons/account_voucher/account_voucher_view.xml
View File

@ -50,16 +50,29 @@
<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>
<div class="oe_title">
<label for="number" class="oe_edit_only"/>
<h1>
<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>
</div>
<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,21 +84,22 @@
<field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
</tree>
</field>
<group col="3">
<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>
<group>
<field name="narration" colspan="2" nolabel="1" placeholder="Add an internal note"/>
</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>
<button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
</group>
</group>
</page>
<page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">