odoo13-addon-ddmrp 13.0.1.29.3__py3-none-any.whl → 13.0.1.29.5__py3-none-any.whl

odoo/addons/ddmrp/__manifest__.py

@@ -5,7 +5,7 @@
 {
     "name": "DDMRP",
     "summary": "Demand Driven Material Requirements Planning",
-    "version": "13.0.1.29.3",
+    "version": "13.0.1.29.5",
     "license": "LGPL-3",
     "development_status": "Beta",
     "author": "ForgeFlow, " "Odoo Community Association (OCA)",

odoo/addons/ddmrp/models/stock_buffer.py

@@ -192,10 +192,13 @@ class StockBuffer(models.Model):
     def action_view_stock_demand_estimates(self):
         result = self.env.ref("stock_demand_estimate.stock_demand_estimate_action")
         action = result.read()[0]
+        locations = self.env["stock.location"].search(
+            [("id", "child_of", [self.location_id.id])]
+        )
         recs = self.env["stock.demand.estimate"].search(
             [
                 ("product_id", "=", self.product_id.id),
-                ("location_id", "=", self.location_id.id),
+                ("location_id", "in", locations.ids),
             ]
         )
         action["domain"] = [("id", "in", recs.ids)]
@@ -921,13 +924,16 @@ class StockBuffer(models.Model):
             rec.order_spike_threshold = 0.5 * rec.red_zone_qty
 
     def _get_manufactured_bom(self):
+        locations = self.env["stock.location"].search(
+            [("id", "child_of", [self.location_id.id])]
+        )
         return self.env["mrp.bom"].search(
             [
                 "|",
                 ("product_id", "=", self.product_id.id),
                 ("product_tmpl_id", "=", self.product_id.product_tmpl_id.id),
                 "|",
-                ("location_id", "=", self.location_id.id),
+                ("location_id", "in", locations.ids),
                 ("location_id", "=", False),
             ],
             limit=1,
@@ -1320,6 +1326,15 @@ class StockBuffer(models.Model):
     def _get_horizon_adu_past_demand(self):
         return self.adu_calculation_method.horizon_past or 0
 
+    def _get_dates_adu_past_demand(self, horizon):
+        date_from = fields.Date.to_string(
+            self.warehouse_id.wh_plan_days(datetime.now(), -1 * horizon)
+        )
+        date_to = fields.Date.to_string(
+            self.warehouse_id.wh_plan_days(datetime.now(), -1)
+        )
+        return date_from, date_to
+
     def _past_demand_estimate_domain(self, date_from, date_to, locations):
         self.ensure_one()
         return [
@@ -1349,12 +1364,7 @@ class StockBuffer(models.Model):
         horizon = self._get_horizon_adu_past_demand()
         # today is excluded to be sure that is a past day and all moves
         # for that day are done (or at least the expected date is in the past).
-        date_from = fields.Date.to_string(
-            self.warehouse_id.wh_plan_days(datetime.now(), -1 * horizon)
-        )
-        date_to = fields.Date.to_string(
-            self.warehouse_id.wh_plan_days(datetime.now(), -1)
-        )
+        date_from, date_to = self._get_dates_adu_past_demand(horizon)
         locations = self.env["stock.location"].search(
             [("id", "child_of", [self.location_id.id])]
         )
@@ -1380,6 +1390,14 @@ class StockBuffer(models.Model):
     def _get_horizon_adu_future_demand(self):
         return self.adu_calculation_method.horizon_future or 1
 
+    def _get_dates_adu_future_demand(self, horizon):
+        date_from = fields.Datetime.now()
+        date_to = self.warehouse_id.wh_plan_days(date_from, horizon)
+        date_to = date_to.replace(
+            hour=date_from.hour, minute=date_from.minute, second=date_from.second,
+        )
+        return date_from, date_to
+
     def _future_demand_estimate_domain(self, date_from, date_to, locations):
         self.ensure_one()
         return [
@@ -1407,11 +1425,7 @@ class StockBuffer(models.Model):
     def _calc_adu_future_demand(self):
         self.ensure_one()
         horizon = self._get_horizon_adu_future_demand()
-        date_from = fields.Datetime.now()
-        date_to = self.warehouse_id.wh_plan_days(date_from, horizon)
-        date_to = date_to.replace(
-            hour=date_from.hour, minute=date_from.minute, second=date_from.second,
-        )
+        date_from, date_to = self._get_dates_adu_future_demand(horizon)
         locations = self.env["stock.location"].search(
             [("id", "child_of", [self.location_id.id])]
         )
@@ -1796,13 +1810,8 @@ class StockBuffer(models.Model):
         return result
 
     def action_view_past_adu(self):
-        horizon = self.adu_calculation_method.horizon_past or 0
-        date_from = fields.Date.to_string(
-            self.warehouse_id.wh_plan_days(datetime.now(), -1 * horizon)
-        )
-        date_to = fields.Date.to_string(
-            self.warehouse_id.wh_plan_days(datetime.now(), -1)
-        )
+        horizon = self._get_horizon_adu_past_demand()
+        date_from, date_to = self._get_dates_adu_past_demand(horizon)
         locations = self.env["stock.location"].search(
             [("id", "child_of", [self.location_id.id])]
         )
@@ -1823,12 +1832,8 @@ class StockBuffer(models.Model):
         return result
 
     def action_view_future_adu(self):
-        horizon = self.adu_calculation_method.horizon_future or 1
-        date_from = fields.Datetime.now()
-        date_to = self.warehouse_id.wh_plan_days(date_from, horizon)
-        date_to = date_to.replace(
-            hour=date_from.hour, minute=date_from.minute, second=date_from.second,
-        )
+        horizon = self._get_horizon_adu_future_demand()
+        date_from, date_to = self._get_dates_adu_future_demand(horizon)
         locations = self.env["stock.location"].search(
             [("id", "child_of", [self.location_id.id])]
         )
@@ -1943,15 +1948,9 @@ class StockBuffer(models.Model):
     def _values_source_location_from_route(self):
         return {"warehouse_id": self.warehouse_id}
 
-    def _source_location_from_route(self, route=None):
-        """Return the replenishment source location for distributed buffers
-
-        If no route is passed, it follows the source location of the rules of
-        all the routes it finds until it can no longer find a path.
-        If a route is passed, it stops at the final source location of the
-        rules of this route only.
-        """
-        current_location = self.location_id
+    def _source_location_from_route(self, procure_location=None):
+        """Return the replenishment source location for distributed buffers"""
+        current_location = procure_location or self.location_id
         rule_values = self._values_source_location_from_route()
         while current_location:
             rule = self.env["procurement.group"]._get_rule(

{odoo13_addon_ddmrp-13.0.1.29.3.dist-info → odoo13_addon_ddmrp-13.0.1.29.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo13-addon-ddmrp
-Version: 13.0.1.29.3
+Version: 13.0.1.29.5
 Summary: Demand Driven Material Requirements Planning
 Home-page: https://github.com/OCA/ddmrp
 Author: ForgeFlow, Odoo Community Association (OCA)

{odoo13_addon_ddmrp-13.0.1.29.3.dist-info → odoo13_addon_ddmrp-13.0.1.29.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
 odoo/addons/ddmrp/README.rst,sha256=XNXcI9HhLckSPJ7I8n5QRc3807c8GaECWhoYol6o1So,12059
 odoo/addons/ddmrp/__init__.py,sha256=nksc4q8fpyy8n5h1T3-Wl9lh_CpdgZj9bBt5fQGvW5Y,98
-odoo/addons/ddmrp/__manifest__.py,sha256=w2IIEOCLKQVC0ALio1RpsCJzAOsK0fOF3dW0YULHjso,2483
+odoo/addons/ddmrp/__manifest__.py,sha256=HbBbN5SYlvjFc0Vo8owHR64S_CKclocPN9U33muqcLY,2483
 odoo/addons/ddmrp/hooks.py,sha256=junTd_jCWr-VzCtrfXkXRIsvfs38rcc0gdzlpFz569o,3275
 odoo/addons/ddmrp/data/decimal_precision_data.xml,sha256=mzYy_aam6bZLGPFl7HPhRv5XGTDCbHAKVZeAl0UYms4,528
 odoo/addons/ddmrp/data/ir_cron.xml,sha256=sW-Y2O0ZfpxQ6IcOOMGzgPX2k-vnSJbKxdcRD_6ybhY,1510
@@ -32,7 +32,7 @@ odoo/addons/ddmrp/models/product_product.py,sha256=smTAvzvAyDqpPfgoTmRmrEeh-mk-2
 odoo/addons/ddmrp/models/product_template.py,sha256=sUUZ8kO3V5Cd7phAopCtd_wuMS_7JUR1giVamnPrI54,975
 odoo/addons/ddmrp/models/purchase_order.py,sha256=tyQvt50nbjZ9v1oij6haq7AcR81LfbTuM6Jv_A5Bsrk,3028
 odoo/addons/ddmrp/models/res_company.py,sha256=8rRgjIAdiC8ODHNCtC1Mp2dwfkyhqCi1FrdLe20zZ7k,643
-odoo/addons/ddmrp/models/stock_buffer.py,sha256=OCkI6x0m2E3CMwfrXN1K_SQiSRon_lAmTZnFVl-VpYc,75200
+odoo/addons/ddmrp/models/stock_buffer.py,sha256=jIwHhb7LpI9KmwcR57JyqJG-k3cIXmOJpMC6GHVgrXU,75157
 odoo/addons/ddmrp/models/stock_buffer_profile.py,sha256=AYqenfaIX7asd5_x8n1tkjvuFP0yKLfDXRkW8PymxWg,2833
 odoo/addons/ddmrp/models/stock_buffer_profile_lead_time.py,sha256=RaWVkX4YlXHULR93n1q8iKv0ldD-DP2VjVz9rqnls2s,570
 odoo/addons/ddmrp/models/stock_buffer_profile_variability.py,sha256=MIUZEWw86lY6WE_xtdAQuKGVB6cUw5s6qLvuSiyKhBg,579
@@ -91,7 +91,7 @@ odoo/addons/ddmrp/wizards/make_procurement_buffer_view.xml,sha256=GWRsJWwB2wDlCe
 odoo/addons/ddmrp/wizards/multi_level_mrp.py,sha256=3U3G6yZYxCc3O4bBddHMbrZ40J6EeXDCLbZd_q4hWnA,755
 odoo/addons/ddmrp/wizards/res_config_settings.py,sha256=6LV2aUKLLFLhUNoDPvsG73E5ht_-uNOZlK2E0wvcYa0,1386
 odoo/addons/ddmrp/wizards/res_config_settings_views.xml,sha256=aW-VYj96df_cGYCy-LFPMnazvnQI4nEL7rH7XbdFvoY,9555
-odoo13_addon_ddmrp-13.0.1.29.3.dist-info/METADATA,sha256=H2NOTy7RRY7Uc63AqEYK7mogwoPbH4vcg60PZMha24I,12984
-odoo13_addon_ddmrp-13.0.1.29.3.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-odoo13_addon_ddmrp-13.0.1.29.3.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo13_addon_ddmrp-13.0.1.29.3.dist-info/RECORD,,
+odoo13_addon_ddmrp-13.0.1.29.5.dist-info/METADATA,sha256=iFbtN2X8QqcUDNaOgEf8T0hq7YEkcFGJu5p0bRZLjVw,12984
+odoo13_addon_ddmrp-13.0.1.29.5.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+odoo13_addon_ddmrp-13.0.1.29.5.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo13_addon_ddmrp-13.0.1.29.5.dist-info/RECORD,,

{odoo13_addon_ddmrp-13.0.1.29.3.dist-info → odoo13_addon_ddmrp-13.0.1.29.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.40.0)
 Root-Is-Purelib: true
 Tag: py3-none-any