Odoo Addons (MOVED TO GITHUB)

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

  1. rdm-account-fiscal-position-view
  2. Merge into 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
=== modified file 'account/partner_view.xml'
--- account/partner_view.xml 2011-09-21 07:13:12 +0000
+++ account/partner_view.xml 2012-03-06 04:18:18 +0000
@@ -15,26 +15,28 @@
15 </group>15 </group>
16 <separator string="Mapping" colspan="4"/>16 <separator string="Mapping" colspan="4"/>
17 <newline/>17 <newline/>
18 <field name="tax_ids" colspan="2" widget="one2many_list" nolabel="1">18 <group colspan="4" col="4">
19 <tree string="Tax Mapping" editable="bottom">19 <field name="tax_ids" colspan="2" widget="one2many_list" nolabel="1">
20 <field name="tax_src_id" domain="[('parent_id','=',False)]"/>20 <tree string="Tax Mapping" editable="bottom">
21 <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>21 <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
22 </tree>22 <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
23 <form string="Tax Mapping">23 </tree>
24 <field name="tax_src_id" domain="[('parent_id','=',False)]"/>24 <form string="Tax Mapping">
25 <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>25 <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
26 </form>26 <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
27 </field>27 </form>
28 <field name="account_ids" colspan="2" widget="one2many_list" nolabel="1">28 </field>
29 <tree string="Account Mapping" editable="bottom">29 <field name="account_ids" colspan="2" widget="one2many_list" nolabel="1">
30 <field name="account_src_id"/>30 <tree string="Account Mapping" editable="bottom">
31 <field name="account_dest_id"/>31 <field name="account_src_id"/>
32 </tree>32 <field name="account_dest_id"/>
33 <form string="Account Mapping">33 </tree>
34 <field name="account_src_id"/>34 <form string="Account Mapping">
35 <field name="account_dest_id"/>35 <field name="account_src_id"/>
36 </form>36 <field name="account_dest_id"/>
37 </field>37 </form>
38 </field>
39 </group>
38 <separator string="Notes" colspan="4"/>40 <separator string="Notes" colspan="4"/>
39 <field name="note" colspan="4" nolabel="1"/>41 <field name="note" colspan="4" nolabel="1"/>
40 </form>42 </form>