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

[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
parent c462e155f7 67ebfdecae
commit 77e26d2358
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
addons/account/account_view.xml
View File

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

4
addons/account_sequence/account_sequence.xml
View File

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