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

[Yannick Vaucher @ Camptocamp]

[Daniel Reis (dreis-pt)]

review: Approve (lgtm. tested install, no errors.)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

review: Approve

=== 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 @@
       <field name="model">account.invoice</field>
       <field name="inherit_id" ref="account.invoice_form" />
       <field name="arch" type="xml">
-        <field name="company_id" position="before">
+        <xpath expr="//page[@string='Other Info']//field[@name='company_id']" position="before">
           <field name="department_id" widget="selection"/>
-        </field>
+        </xpath>
       </field>
     </record>
 
@@ -46,9 +46,9 @@
       <field name="inherit_id" ref="account.invoice_supplier_form" />
       <field name="priority">2</field>
       <field name="arch" type="xml">
-        <field name="company_id" position="before">
+        <xpath expr="//page[@string='Other Info']//field[@name='company_id']" position="before">
           <field name="department_id" widget="selection"/>
-        </field>
+        </xpath>
       </field>
     </record>