Merge lp:~camptocamp/department-mgmt/7.0-fix-invoice_department-view into lp:~department-core-editors/department-mgmt/7.0

Proposed by Yannick Vaucher @ Camptocamp
Status: Merged
Merged at revision: 16
Proposed branch: lp:~camptocamp/department-mgmt/7.0-fix-invoice_department-view
Merge into: lp:~department-core-editors/department-mgmt/7.0
Diff against target: 26 lines (+4/-4)
1 file modified
invoice_department/invoice_view.xml (+4/-4)
To merge this branch: bzr merge lp:~camptocamp/department-mgmt/7.0-fix-invoice_department-view
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp Approve
Daniel Reis lgtm. tested install, no errors. Approve
Review via email: mp+175035@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Reis (dreis-pt) :
review: Approve (lgtm. tested install, no errors.)
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'invoice_department/invoice_view.xml'
--- invoice_department/invoice_view.xml 2013-05-02 15:02:05 +0000
+++ invoice_department/invoice_view.xml 2013-07-16 14:35:36 +0000
@@ -18,9 +18,9 @@
18 <field name="model">account.invoice</field>18 <field name="model">account.invoice</field>
19 <field name="inherit_id" ref="account.invoice_form" />19 <field name="inherit_id" ref="account.invoice_form" />
20 <field name="arch" type="xml">20 <field name="arch" type="xml">
21 <field name="company_id" position="before">21 <xpath expr="//page[@string='Other Info']//field[@name='company_id']" position="before">
22 <field name="department_id" widget="selection"/>22 <field name="department_id" widget="selection"/>
23 </field>23 </xpath>
24 </field>24 </field>
25 </record>25 </record>
2626
@@ -46,9 +46,9 @@
46 <field name="inherit_id" ref="account.invoice_supplier_form" />46 <field name="inherit_id" ref="account.invoice_supplier_form" />
47 <field name="priority">2</field>47 <field name="priority">2</field>
48 <field name="arch" type="xml">48 <field name="arch" type="xml">
49 <field name="company_id" position="before">49 <xpath expr="//page[@string='Other Info']//field[@name='company_id']" position="before">
50 <field name="department_id" widget="selection"/>50 <field name="department_id" widget="selection"/>
51 </field>51 </xpath>
52 </field>52 </field>
53 </record>53 </record>
5454

Subscribers

People subscribed via source and target branches