diff --git a/MANIFEST.in b/MANIFEST.in
index 478d5ff1cf..fc0b03eaf2 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include CHANGELOG
 include LICENSE
 include tryton.cfg
 include *.xml
+include view/*.xml
 include *.odt
 include locale/*.po
 include doc/*
diff --git a/carrier.xml b/carrier.xml
index fc3f6a12b5..9fccef0359 100644
--- a/carrier.xml
+++ b/carrier.xml
@@ -6,40 +6,14 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="carrier_view_form">
             <field name="model">carrier</field>
             <field name="inherit" ref="carrier.carrier_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/notebook/page[@id='carrier']/field[@name='carrier_product']"
-                        position="after">
-                        <newline/>
-                        <label name="carrier_cost_allocation_method"/>
-                        <field name="carrier_cost_allocation_method"/>
-                        <newline/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">carrier_form</field>
         </record>
 
         <record model="ir.ui.view" id="carrier_view_form2">
             <field name="model">carrier</field>
             <field name="type">form</field>
             <field name="inherit" ref="carrier.carrier_view_form2"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/field[@name='carrier_product']"
-                        position="after">
-                        <newline/>
-                        <label name="carrier_cost_allocation_method"/>
-                        <field name="carrier_cost_allocation_method"/>
-                        <newline/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">carrier_form2</field>
         </record>
     </data>
 </tryton>
diff --git a/setup.py b/setup.py
index 31da06d348..99c82849a8 100644
--- a/setup.py
+++ b/setup.py
@@ -55,7 +55,7 @@ setup(name='trytond_purchase_shipment_cost',
         ],
     package_data={
         'trytond.modules.purchase_shipment_cost': (info.get('xml', [])
-            + ['tryton.cfg', 'locale/*.po', 'tests/*.rst']),
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'tests/*.rst']),
         },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
diff --git a/stock.xml b/stock.xml
index 7ca4b8e962..9a675d675c 100644
--- a/stock.xml
+++ b/stock.xml
@@ -7,22 +7,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="model">stock.shipment.in</field>
             <field name="type">form</field>
             <field name="inherit" ref="stock.shipment_in_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath expr="/form/notebook"
-                        position="after">
-                        <label name="carrier"/>
-                        <field name="carrier"/>
-                        <label name="cost"/>
-                        <group col="2" id="cost">
-                            <field name="cost"/>
-                            <field name="cost_currency"/>
-                        </group>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">shipment_in_form</field>
         </record>
     </data>
 </tryton>
diff --git a/view/carrier_form.xml b/view/carrier_form.xml
new file mode 100644
index 0000000000..fe003f58a9
--- /dev/null
+++ b/view/carrier_form.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath
+        expr="/form/notebook/page[@id='carrier']/field[@name='carrier_product']"
+        position="after">
+        <newline/>
+        <label name="carrier_cost_allocation_method"/>
+        <field name="carrier_cost_allocation_method"/>
+        <newline/>
+    </xpath>
+</data>
diff --git a/view/carrier_form2.xml b/view/carrier_form2.xml
new file mode 100644
index 0000000000..faa61964e4
--- /dev/null
+++ b/view/carrier_form2.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="/form/field[@name='carrier_product']" position="after">
+        <newline/>
+        <label name="carrier_cost_allocation_method"/>
+        <field name="carrier_cost_allocation_method"/>
+        <newline/>
+    </xpath>
+</data>
diff --git a/view/shipment_in_form.xml b/view/shipment_in_form.xml
new file mode 100644
index 0000000000..1f0a8a66d2
--- /dev/null
+++ b/view/shipment_in_form.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="/form/notebook" position="after">
+        <label name="carrier"/>
+        <field name="carrier"/>
+        <label name="cost"/>
+        <group col="2" id="cost">
+            <field name="cost"/>
+            <field name="cost_currency"/>
+        </group>
+    </xpath>
+</data>