diff --git a/location.xml b/location.xml
index 9e7b31f0e1..029913bc22 100644
--- a/location.xml
+++ b/location.xml
@@ -127,51 +127,6 @@ this repository contains the full copyright notices and license terms. -->
             <field name="perm_delete" eval="True"/>
         </record>
 
-        <!-- Default locations -->
-        <record model="stock.location" id="location_warehouse">
-            <field name="name">Warehouse</field>
-        </record>
-        <record model="stock.location" id="location_input">
-            <field name="name">Input Zone</field>
-            <field name="code">IN</field>
-            <field name="type">storage</field>
-            <field name="parent" ref="location_warehouse"/>
-        </record>
-        <record model="stock.location" id="location_output">
-            <field name="name">Output Zone</field>
-            <field name="code">OUT</field>
-            <field name="type">storage</field>
-            <field name="parent" ref="location_warehouse"/>
-        </record>
-        <record model="stock.location" id="location_storage">
-            <field name="name">Storage Zone</field>
-            <field name="code">STO</field>
-            <field name="type">storage</field>
-            <field name="parent" ref="location_warehouse"/>
-        </record>
-        <record model="stock.location" id="location_warehouse" update="1">
-            <field name="name">Warehouse</field>
-            <field name="code">WH</field>
-            <field name="type">warehouse</field>
-            <field name="input_location" ref="location_input"/>
-            <field name="output_location" ref="location_output"/>
-            <field name="storage_location" ref="location_storage"/>
-        </record>
-        <record model="stock.location" id="location_supplier">
-            <field name="name">Supplier</field>
-            <field name="code">SUP</field>
-            <field name="type">supplier</field>
-        </record>
-        <record model="stock.location" id="location_customer">
-            <field name="name">Customer</field>
-            <field name="code">CUS</field>
-            <field name="type">customer</field>
-        </record>
-        <record model="stock.location" id="location_lost_found">
-            <field name="name">Lost and Found</field>
-            <field name="type">lost_found</field>
-        </record>
-
         <record model="ir.ui.view" id="party_view_form">
             <field name="model">party.party</field>
             <field name="inherit" ref="party.party_view_form"/>
@@ -206,6 +161,47 @@ this repository contains the full copyright notices and license terms. -->
             </field>
         </record>
 
+    </data>
+    <data noupdate="1">
+        <!-- Default locations -->
+        <record model="stock.location" id="location_input">
+            <field name="name">Input Zone</field>
+            <field name="code">IN</field>
+            <field name="type">storage</field>
+        </record>
+        <record model="stock.location" id="location_output">
+            <field name="name">Output Zone</field>
+            <field name="code">OUT</field>
+            <field name="type">storage</field>
+        </record>
+        <record model="stock.location" id="location_storage">
+            <field name="name">Storage Zone</field>
+            <field name="code">STO</field>
+            <field name="type">storage</field>
+        </record>
+        <record model="stock.location" id="location_warehouse">
+            <field name="name">Warehouse</field>
+            <field name="code">WH</field>
+            <field name="type">warehouse</field>
+            <field name="input_location" ref="location_input"/>
+            <field name="output_location" ref="location_output"/>
+            <field name="storage_location" ref="location_storage"/>
+        </record>
+        <record model="stock.location" id="location_supplier">
+            <field name="name">Supplier</field>
+            <field name="code">SUP</field>
+            <field name="type">supplier</field>
+        </record>
+        <record model="stock.location" id="location_customer">
+            <field name="name">Customer</field>
+            <field name="code">CUS</field>
+            <field name="type">customer</field>
+        </record>
+        <record model="stock.location" id="location_lost_found">
+            <field name="name">Lost and Found</field>
+            <field name="type">lost_found</field>
+        </record>
+
         <record model="ir.property" id="property_supplier_location">
             <field name="name">supplier_location</field>
             <field name="field"