From a931278e455c3f36d70eead2982971c1053e7eeb Mon Sep 17 00:00:00 2001
From: Lorenzo Battistini <lorenzo.battistini@agilebg.com>
Date: Wed, 6 Dec 2017 15:06:04 +0100
Subject: [PATCH] FIX l10n_it_reverse_charge to make it work with intrastat
 (#418)

---
 .../views/account_invoice_view.xml            | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/l10n_it_reverse_charge/views/account_invoice_view.xml b/l10n_it_reverse_charge/views/account_invoice_view.xml
index 64aa330d730e..7926d9ca12e4 100644
--- a/l10n_it_reverse_charge/views/account_invoice_view.xml
+++ b/l10n_it_reverse_charge/views/account_invoice_view.xml
@@ -11,19 +11,17 @@
         <field name="model">account.invoice</field>
         <field name="inherit_id" ref="account.invoice_supplier_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//form/sheet/notebook/page[2]/group"
-                   position="inside">
-                <group string="Self Invoicing">
-                    <field name="rc_self_invoice_id" readonly="True"
-                           context="{'form_view_ref': 'account.invoice_form'}"/>
-                    <field name="rc_self_purchase_invoice_id" readonly="True"
-                           context="{'form_view_ref': 'account.supplier_invoice_form'}"/>
-                </group>
-            </xpath>
-            <xpath expr="//form/sheet/notebook/page[1]/field[@name='invoice_line_ids']/tree/field[@name='currency_id']"
+            <field name="move_id"
+                   position="after">
+                <field name="rc_self_invoice_id" readonly="True"
+                       context="{'form_view_ref': 'account.invoice_form'}"/>
+                <field name="rc_self_purchase_invoice_id" readonly="True"
+                       context="{'form_view_ref': 'account.supplier_invoice_form'}"/>
+            </field>
+            <field name="price_subtotal"
                    position="after">
                 <field name="rc"/>
-            </xpath>
+            </field>
         </field>
     </record>
 
@@ -45,13 +43,11 @@
         <field name="model">account.invoice</field>
         <field name="inherit_id" ref="account.invoice_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//form/sheet/notebook/page[2]/group"
-                   position="inside">
-                <group string="Self Invoicing">
-                    <field name="rc_purchase_invoice_id" readonly="True"
-                           context="{'form_view_ref': 'account.supplier_invoice_form'}"/>
-                </group>
-            </xpath>
+            <field name="move_id"
+                   position="after">
+                <field name="rc_purchase_invoice_id" readonly="True"
+                       context="{'form_view_ref': 'account.supplier_invoice_form'}"/>
+            </field>
         </field>
     </record>
 </odoo>