From da4dbe99a3f55082142d8c8f36bd0415f701804a Mon Sep 17 00:00:00 2001
From: LaiaTForgeFlow <laia.turull@forgeflow.com>
Date: Wed, 15 Jun 2022 12:40:54 +0200
Subject: [PATCH] [FIX]mrp_multi_level: avoid mixing str with boolean

---
 mrp_multi_level/wizards/mrp_inventory_procure.py |  4 ++--
 mrp_multi_level/wizards/mrp_multi_level.py       | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mrp_multi_level/wizards/mrp_inventory_procure.py b/mrp_multi_level/wizards/mrp_inventory_procure.py
index 9d721b4dc..0ae935f82 100644
--- a/mrp_multi_level/wizards/mrp_inventory_procure.py
+++ b/mrp_multi_level/wizards/mrp_inventory_procure.py
@@ -83,8 +83,8 @@ class MrpInventoryProcure(models.TransientModel):
                     item.qty,
                     item.uom_id,
                     item.location_id,
-                    "MRP: " + item.planned_order_id.name or str(self.env.user.login),
-                    "MRP: " + item.planned_order_id.origin or str(self.env.user.login),
+                    "MRP: " + (item.planned_order_id.name or self.env.user.login),
+                    "MRP: " + (item.planned_order_id.origin or self.env.user.login),
                     item.mrp_inventory_id.company_id,
                     values,
                 )
diff --git a/mrp_multi_level/wizards/mrp_multi_level.py b/mrp_multi_level/wizards/mrp_multi_level.py
index 683a7fdd1..731230d81 100644
--- a/mrp_multi_level/wizards/mrp_multi_level.py
+++ b/mrp_multi_level/wizards/mrp_multi_level.py
@@ -95,7 +95,7 @@ class MultiLevelMrp(models.TransientModel):
             "mrp_date": mrp_date,
             "current_date": move.date,
             "mrp_type": mrp_type,
-            "mrp_origin": origin,
+            "mrp_origin": origin or "",
             "mrp_order_number": order_number,
             "parent_product_id": parent_product_id,
             "name": order_number,
@@ -513,7 +513,7 @@ class MultiLevelMrp(models.TransientModel):
                     product_name=product_mrp_area.product_id.display_name,
                     delta_days=grouping_delta,
                 )
-                origin = ",".join(list(set(demand_origin)))
+                origin = ",".join(list({x for x in demand_origin if x}))
                 qtytoorder = product_mrp_area.mrp_minimum_stock - onhand - last_qty
                 cm = self.create_action(
                     product_mrp_area_id=product_mrp_area,
@@ -541,7 +541,7 @@ class MultiLevelMrp(models.TransientModel):
             else:
                 last_date = fields.Date.from_string(move.mrp_date)
                 onhand += move.mrp_qty
-            demand_origin.append(move.origin or move.name)
+            demand_origin.append(move.origin or move.name or "")
 
         if last_date and last_qty != 0.00:
             name = _(
@@ -550,7 +550,7 @@ class MultiLevelMrp(models.TransientModel):
                 product_name=product_mrp_area.product_id.display_name,
                 delta_days=grouping_delta,
             )
-            origin = ",".join(list(set(demand_origin)))
+            origin = ",".join(list({x for x in demand_origin if x}))
             qtytoorder = product_mrp_area.mrp_minimum_stock - onhand - last_qty
             cm = self.create_action(
                 product_mrp_area_id=product_mrp_area,
@@ -601,8 +601,8 @@ class MultiLevelMrp(models.TransientModel):
                                     product_mrp_area_id=product_mrp_area,
                                     mrp_date=move.mrp_date,
                                     mrp_qty=qtytoorder,
-                                    name=move.name,
-                                    values=dict(origin=move.origin),
+                                    name=move.name or "",
+                                    values=dict(origin=move.origin or ""),
                                 )
                                 qty_ordered = cm["qty_ordered"]
                                 onhand += move.mrp_qty + qty_ordered