From 44af06132e548970a91e2e554fe305ed7e8c44e4 Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Wed, 9 Dec 2020 22:25:36 +0000
Subject: [PATCH] [FIX] uom: move product_uom_dozen back to data
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In commit ab76c421c27 the Dozens unit of measure was moved to demo data.
Unfortunately, this data is used in enterprise module product_unspc in a
post init hook.

As a consequence, when installing this module without demo data, the
initialization crashes.

With this commit, the Dozens uom is moved back to regular data.

closes odoo/odoo#63120

X-original-commit: e194c39e044710cbf314427d77bd2b87795c34ff
Signed-off-by: Xavier Dollé (xdo) <xdo@odoo.com>
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
---
 addons/uom/__manifest__.py   |  3 ---
 addons/uom/data/uom_data.xml |  7 +++++++
 addons/uom/data/uom_demo.xml | 11 -----------
 3 files changed, 7 insertions(+), 14 deletions(-)
 delete mode 100644 addons/uom/data/uom_demo.xml

diff --git a/addons/uom/__manifest__.py b/addons/uom/__manifest__.py
index c8443071d1d..d3eaaa9ed51 100644
--- a/addons/uom/__manifest__.py
+++ b/addons/uom/__manifest__.py
@@ -16,9 +16,6 @@ This is the base module for managing Units of measure.
         'security/ir.model.access.csv',
         'views/uom_uom_views.xml',
     ],
-    'demo': [
-        'data/uom_demo.xml',
-    ],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/uom/data/uom_data.xml b/addons/uom/data/uom_data.xml
index a41b5054561..1129dfd3179 100644
--- a/addons/uom/data/uom_data.xml
+++ b/addons/uom/data/uom_data.xml
@@ -27,6 +27,13 @@
         <field name="uom_type">reference</field>
     </record>
 
+    <record id="product_uom_dozen" model="uom.uom">
+        <field name="category_id" ref="uom.product_uom_categ_unit"/>
+        <field name="name">Dozens</field>
+        <field name="factor_inv" eval="12"/>
+        <field name="uom_type">bigger</field>
+    </record>
+
     <!-- WORKING TIME -->
     <record id="product_uom_day" model="uom.uom">
         <field name="name">Days</field>
diff --git a/addons/uom/data/uom_demo.xml b/addons/uom/data/uom_demo.xml
deleted file mode 100644
index 74fe30b2876..00000000000
--- a/addons/uom/data/uom_demo.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<odoo noupdate="1">
-
-    <record id="product_uom_dozen" model="uom.uom">
-        <field name="category_id" ref="uom.product_uom_categ_unit"/>
-        <field name="name">Dozens</field>
-        <field name="factor_inv" eval="12"/>
-        <field name="uom_type">bigger</field>
-    </record>
-
-</odoo>