Merge lp:~code-repository/openobject-addons/rdm-account-fiscal-position-view into lp:openobject-addons/6.1

Proposed by Willow IT's Code Repository Admin
Status: Needs review
Proposed branch: lp:~code-repository/openobject-addons/rdm-account-fiscal-position-view
Merge into: lp:openobject-addons/6.1
Diff against target: 52 lines (+22/-20)
1 file modified
account/partner_view.xml (+22/-20)
To merge this branch: bzr merge lp:~code-repository/openobject-addons/rdm-account-fiscal-position-view
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+96056@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

6646. By OpenERP <openerp@ubuntu>

Propose a 'group' around two fields to allow greater flexibility
when extending the view.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/partner_view.xml'
2--- account/partner_view.xml 2011-09-21 07:13:12 +0000
3+++ account/partner_view.xml 2012-03-06 04:18:18 +0000
4@@ -15,26 +15,28 @@
5 </group>
6 <separator string="Mapping" colspan="4"/>
7 <newline/>
8- <field name="tax_ids" colspan="2" widget="one2many_list" nolabel="1">
9- <tree string="Tax Mapping" editable="bottom">
10- <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
11- <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
12- </tree>
13- <form string="Tax Mapping">
14- <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
15- <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
16- </form>
17- </field>
18- <field name="account_ids" colspan="2" widget="one2many_list" nolabel="1">
19- <tree string="Account Mapping" editable="bottom">
20- <field name="account_src_id"/>
21- <field name="account_dest_id"/>
22- </tree>
23- <form string="Account Mapping">
24- <field name="account_src_id"/>
25- <field name="account_dest_id"/>
26- </form>
27- </field>
28+ <group colspan="4" col="4">
29+ <field name="tax_ids" colspan="2" widget="one2many_list" nolabel="1">
30+ <tree string="Tax Mapping" editable="bottom">
31+ <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
32+ <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
33+ </tree>
34+ <form string="Tax Mapping">
35+ <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
36+ <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
37+ </form>
38+ </field>
39+ <field name="account_ids" colspan="2" widget="one2many_list" nolabel="1">
40+ <tree string="Account Mapping" editable="bottom">
41+ <field name="account_src_id"/>
42+ <field name="account_dest_id"/>
43+ </tree>
44+ <form string="Account Mapping">
45+ <field name="account_src_id"/>
46+ <field name="account_dest_id"/>
47+ </form>
48+ </field>
49+ </group>
50 <separator string="Notes" colspan="4"/>
51 <field name="note" colspan="4" nolabel="1"/>
52 </form>