Merge PR #767 into 15.0

Signed-off-by LoisRForgeFlow

mrp_multi_level/models/product_mrp_area.py

@@ -60,6 +60,7 @@ class ProductMRPArea(models.Model):
         "to be valid for the MRP.",
     )
     mrp_lead_time = fields.Float(string="Lead Time", compute="_compute_mrp_lead_time")
+    distribution_lead_time = fields.Float()
     main_supplier_id = fields.Many2one(
         comodel_name="res.partner",
         string="Main Supplier",
@@ -158,12 +159,16 @@ class ProductMRPArea(models.Model):
     def _compute_mrp_lead_time(self):
         produced = self.filtered(lambda r: r.supply_method == "manufacture")
         purchased = self.filtered(lambda r: r.supply_method == "buy")
+        distributed = self.filtered(
+            lambda r: r.supply_method in ("pull", "push", "pull_push")
+        )
         for rec in produced:
             rec.mrp_lead_time = rec.product_id.produce_delay
         for rec in purchased:
             rec.mrp_lead_time = rec.main_supplierinfo_id.delay
-        # TODO: 'move' supply method.
-        for rec in self - produced - purchased:
+        for rec in distributed:
+            rec.mrp_lead_time = rec.distribution_lead_time
+        for rec in self - produced - purchased - distributed:
             rec.mrp_lead_time = 0
 
     def _compute_qty_available(self):

mrp_multi_level/views/product_mrp_area_views.xml

@@ -93,8 +93,15 @@
                             <field name="mrp_maximum_order_qty" />
                             <field name="mrp_qty_multiple" />
                             <field name="supply_method" />
+                            <field
+                                name="distribution_lead_time"
+                                attrs="{'invisible': [('supply_method', 'not in', ('pull', 'push', 'pull_push'))]}"
+                            />
                             <field name="mrp_lead_time" />
-                            <field name="main_supplierinfo_id" />
+                            <field
+                                name="main_supplierinfo_id"
+                                attrs="{'invisible':[('supply_method', '!=', 'buy')]}"
+                            />
                         </group>
                     </group>
                     <notebook>

mrp_multi_level/wizards/mrp_inventory_procure.py

@@ -135,9 +135,7 @@ class MrpInventoryProcureItem(models.TransientModel):
 
     def _prepare_procurement_values(self, group=False):
         return {
-            "date_planned": fields.Datetime.to_string(
-                fields.Date.from_string(self.date_planned)
-            ),
+            "date_planned": self.date_planned,
             "warehouse_id": self.warehouse_id,
             "group_id": group,
             "planned_order_id": self.planned_order_id.id,