[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-journal_entries-nco

bzr revid: atp@tinyerp.com-20120627140554-stu1jzvldbdyvld7
This commit is contained in:
Atul Patel (OpenERP) 2012-06-27 19:35:54 +05:30
commit 77e26d2358
2 changed files with 16 additions and 13 deletions

View File

@ -1281,15 +1281,19 @@
</header> </header>
<sheet string="Journal Entries" layout="auto"> <sheet string="Journal Entries" layout="auto">
<group col="4"> <group col="4">
<field name="name" readonly="True"/> <group>
<field name="ref"/> <field name="name" readonly="True"/>
<field name="journal_id"/> <field name="journal_id"/>
<field name="period_id"/> <field name="period_id"/>
<field name="to_check"/> <field name="company_id" required="1" groups="base.group_multi_company"/>
<field name="date"/> <field name="partner_id" invisible="1"/>
<field name="company_id" required="1" groups="base.group_multi_company"/> </group>
<field name="partner_id" invisible="1"/> <group>
<field name="amount" invisible="1"/> <field name="ref"/>
<field name="date"/>
<field name="to_check"/>
<field name="amount" invisible="1"/>
</group>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="Journal Items"> <page string="Journal Items">
@ -1381,8 +1385,7 @@
<field name="reconcile_partial_id"/> <field name="reconcile_partial_id"/>
</tree> </tree>
</field> </field>
<separator string="Internal Note"/> <field name="narration" colspan="4" placeholder="Add an internal note." nolabel="1" height="50"/>
<field name="narration" colspan="4" nolabel="1" height="50"/>
</page> </page>
</notebook> </notebook>
</sheet> </sheet>

View File

@ -8,7 +8,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="account.view_move_form"/> <field name="inherit_id" ref="account.view_move_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="to_check" position="after"> <field name="period_id" position="after">
<field name="internal_sequence_number"/> <field name="internal_sequence_number"/>
</field> </field>
</field> </field>
@ -44,7 +44,7 @@
<field name="inherit_id" ref="account.view_account_move_filter"/> <field name="inherit_id" ref="account.view_account_move_filter"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<data> <data>
<xpath expr="//field[@name='ref']" position="before"> <xpath expr="//field[@name='name']" position="before">
<field name="internal_sequence_number"/> <field name="internal_sequence_number"/>
</xpath> </xpath>
</data> </data>