From 5566d9e385435ddd2ff58563933c933fd1d88e8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miquel=20Ra=C3=AFch?= <miquel.raich@forgeflow.com>
Date: Fri, 17 Jun 2022 17:04:19 +0200
Subject: [PATCH 1/4] [IMP] mrp_multi_level: add utf8 encoding to xml files

---
 mrp_multi_level/security/mrp_multi_level_security.xml   | 2 +-
 mrp_multi_level/views/mrp_area_views.xml                | 2 +-
 mrp_multi_level/views/mrp_inventory_views.xml           | 2 +-
 mrp_multi_level/views/mrp_menuitem.xml                  | 2 +-
 mrp_multi_level/views/mrp_move_views.xml                | 2 +-
 mrp_multi_level/views/product_mrp_area_views.xml        | 2 +-
 mrp_multi_level/views/product_product_views.xml         | 2 +-
 mrp_multi_level/views/product_template_views.xml        | 2 +-
 mrp_multi_level/views/stock_location_views.xml          | 2 +-
 mrp_multi_level/wizards/mrp_inventory_procure_views.xml | 2 +-
 mrp_multi_level/wizards/mrp_multi_level_views.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mrp_multi_level/security/mrp_multi_level_security.xml b/mrp_multi_level/security/mrp_multi_level_security.xml
index 49aa201ee..8fa95f687 100644
--- a/mrp_multi_level/security/mrp_multi_level_security.xml
+++ b/mrp_multi_level/security/mrp_multi_level_security.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
     <record id="group_change_mrp_procure_qty" model="res.groups">
         <field name="name">Change procure quantity in MRP</field>
diff --git a/mrp_multi_level/views/mrp_area_views.xml b/mrp_multi_level/views/mrp_area_views.xml
index a319a89be..d84f5049e 100644
--- a/mrp_multi_level/views/mrp_area_views.xml
+++ b/mrp_multi_level/views/mrp_area_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record model="ir.ui.view" id="mrp_area_tree">
         <field name="name">mrp.area.tree</field>
diff --git a/mrp_multi_level/views/mrp_inventory_views.xml b/mrp_multi_level/views/mrp_inventory_views.xml
index e973b675f..d16dab2f9 100644
--- a/mrp_multi_level/views/mrp_inventory_views.xml
+++ b/mrp_multi_level/views/mrp_inventory_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="mrp_inventory_form" model="ir.ui.view">
         <field name="name">mrp.inventory.form</field>
diff --git a/mrp_multi_level/views/mrp_menuitem.xml b/mrp_multi_level/views/mrp_menuitem.xml
index 62c94fdf6..7f2b89f12 100644
--- a/mrp_multi_level/views/mrp_menuitem.xml
+++ b/mrp_multi_level/views/mrp_menuitem.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <menuitem name="MRP" id="menu_mrp_mrp" parent="mrp.menu_mrp_root" sequence="22" />
     <menuitem
diff --git a/mrp_multi_level/views/mrp_move_views.xml b/mrp_multi_level/views/mrp_move_views.xml
index b1655404d..65e61d50e 100644
--- a/mrp_multi_level/views/mrp_move_views.xml
+++ b/mrp_multi_level/views/mrp_move_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="mrp_move_view_form" model="ir.ui.view">
         <field name="name">mrp.move.form</field>
diff --git a/mrp_multi_level/views/product_mrp_area_views.xml b/mrp_multi_level/views/product_mrp_area_views.xml
index 702900b44..d13ef592f 100644
--- a/mrp_multi_level/views/product_mrp_area_views.xml
+++ b/mrp_multi_level/views/product_mrp_area_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record model="ir.ui.view" id="product_mrp_area_tree">
         <field name="name">product.mrp.area.tree</field>
diff --git a/mrp_multi_level/views/product_product_views.xml b/mrp_multi_level/views/product_product_views.xml
index 50076ba05..da018d344 100644
--- a/mrp_multi_level/views/product_product_views.xml
+++ b/mrp_multi_level/views/product_product_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record model="ir.ui.view" id="view_mrp_product_product_form">
         <field name="name">view.product.mrp.area.product.form</field>
diff --git a/mrp_multi_level/views/product_template_views.xml b/mrp_multi_level/views/product_template_views.xml
index 8631b1000..40fd43882 100644
--- a/mrp_multi_level/views/product_template_views.xml
+++ b/mrp_multi_level/views/product_template_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="product_template_only_form_view_mrp" model="ir.ui.view">
         <field name="name">product.template.product.form.mrp</field>
diff --git a/mrp_multi_level/views/stock_location_views.xml b/mrp_multi_level/views/stock_location_views.xml
index 412866aad..ac4a389b6 100644
--- a/mrp_multi_level/views/stock_location_views.xml
+++ b/mrp_multi_level/views/stock_location_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="view_location_form" model="ir.ui.view">
         <field name="name">stock.location.form</field>
diff --git a/mrp_multi_level/wizards/mrp_inventory_procure_views.xml b/mrp_multi_level/wizards/mrp_inventory_procure_views.xml
index 0467530eb..4bfa1ad1d 100644
--- a/mrp_multi_level/wizards/mrp_inventory_procure_views.xml
+++ b/mrp_multi_level/wizards/mrp_inventory_procure_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <!--  Make Procurement with security access right -->
     <record id="view_mrp_inventory_procure_wizard" model="ir.ui.view">
diff --git a/mrp_multi_level/wizards/mrp_multi_level_views.xml b/mrp_multi_level/wizards/mrp_multi_level_views.xml
index 153948396..5ff459716 100644
--- a/mrp_multi_level/wizards/mrp_multi_level_views.xml
+++ b/mrp_multi_level/wizards/mrp_multi_level_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="view_run_mrp_multi_level_wizard" model="ir.ui.view">
         <field name="name">Run MRP</field>

From 08a04b07bc45b367e21df06320f56dca8e89cda4 Mon Sep 17 00:00:00 2001
From: Christopher Ormaza <chris.ormaza@forgeflow.com>
Date: Fri, 17 Jun 2022 11:37:24 -0500
Subject: [PATCH 2/4] [FIX] mrp_bom_tracking: product.uom -> uom.uom

---
 mrp_bom_tracking/models/mrp_bom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mrp_bom_tracking/models/mrp_bom.py b/mrp_bom_tracking/models/mrp_bom.py
index 11b08307b..58a01fd06 100644
--- a/mrp_bom_tracking/models/mrp_bom.py
+++ b/mrp_bom_tracking/models/mrp_bom.py
@@ -69,7 +69,7 @@ class MrpBomLine(models.Model):
                     product_qty = values.get("product_qty") or lines.product_qty
                     product_uom_id = values.get("product_uom_id")
                     if product_uom_id:
-                        product_uom_id = self.env["product.uom"].browse(product_uom_id)
+                        product_uom_id = self.env["uom.uom"].browse(product_uom_id)
                     product_uom_id = product_uom_id or lines.product_uom_id
                     bom.message_post_with_view(
                         "mrp_bom_tracking.track_bom_line_template",

From 41653ee419666bc4ee9a6acc567e918c66a5d0c4 Mon Sep 17 00:00:00 2001
From: Christopher Ormaza <chris.ormaza@forgeflow.com>
Date: Fri, 17 Jun 2022 11:37:24 -0500
Subject: [PATCH 3/4] [FIX] mrp_planned_order_matrix: <act_window> is
 deprecated

---
 .../wizards/mrp_planned_order_wizard_view.xml   | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/mrp_planned_order_matrix/wizards/mrp_planned_order_wizard_view.xml b/mrp_planned_order_matrix/wizards/mrp_planned_order_wizard_view.xml
index c5c2b7a5f..3723e28b1 100644
--- a/mrp_planned_order_matrix/wizards/mrp_planned_order_wizard_view.xml
+++ b/mrp_planned_order_matrix/wizards/mrp_planned_order_wizard_view.xml
@@ -98,15 +98,14 @@
             </form>
         </field>
     </record>
-    <act_window
-        id="action_mrp_planned_order_wizard"
-        name="Create Fixed Planned Orders"
-        res_model="mrp.planned.order.wizard"
-        binding_model="mrp.planned.order.sheet"
-        binding_views="list"
-        view_mode="form"
-        target="new"
-    />
+    <record id="action_mrp_planned_order_wizard" model="ir.actions.act_window">
+        <field name="name">Create Fixed Planned Orders</field>
+        <field name="res_model">mrp.planned.order.wizard</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+        <field name="binding_model_id" ref="model_mrp_planned_order_sheet" />
+        <field name="binding_view_types">list</field>
+    </record>
     <menuitem
         id="menu_stock_mrp_planned_order_wizard"
         parent="mrp.mrp_planning_menu_root"

From 943d446ede0368679169abcba5060f2df7cf645d Mon Sep 17 00:00:00 2001
From: Christopher Ormaza <chris.ormaza@forgeflow.com>
Date: Fri, 17 Jun 2022 11:47:47 -0500
Subject: [PATCH 4/4] [FIX] mrp_workorder_sequence: use common test, don't
 repeat bom tests

---
 mrp_workorder_sequence/tests/test_mrp_workorder_sequence.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mrp_workorder_sequence/tests/test_mrp_workorder_sequence.py b/mrp_workorder_sequence/tests/test_mrp_workorder_sequence.py
index f9206f7c8..c8a434a34 100644
--- a/mrp_workorder_sequence/tests/test_mrp_workorder_sequence.py
+++ b/mrp_workorder_sequence/tests/test_mrp_workorder_sequence.py
@@ -4,10 +4,10 @@
 from odoo import Command
 from odoo.tests import Form
 
-from odoo.addons.mrp.tests.test_bom import TestBoM
+from odoo.addons.mrp.tests.common import TestMrpCommon
 
 
-class TestMrpWorkorderSequence(TestBoM):
+class TestMrpWorkorderSequence(TestMrpCommon):
     def test_mrp_workorder_sequence(self):
         self.env["mrp.bom"].create(
             {