[MIG]stock_orderpoint_procure_location to v15

Author: AaronHForgeFlow

stock_orderpoint_procure_location/README.rst

@@ -1,11 +1,33 @@
-.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
-   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
-   :alt: License: AGPL-3
-
 =================================
 Stock Orderpoint Procure Location
 =================================
 
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:73b3a40fdbb04ac7fc276faa02e2d1bf0019c894d861d78ee9f970fe2ef87cb5
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github
+    :target: https://github.com/OCA/stock-logistics-warehouse/tree/15.0/stock_orderpoint_procure_location
+    :alt: OCA/stock-logistics-warehouse
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-15-0/stock-logistics-warehouse-15-0-stock_orderpoint_procure_location
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-warehouse&target_branch=15.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
 This module allows users to define the procure location to be used
 in procurements created from minimum stock rules.
 
@@ -14,49 +36,63 @@ the movement to stock is created either manually or through a push rule.
 Thus I need to take into account the qty in stock but I prefer to receive in
 input location first.
 
+**Table of contents**
+
+.. contents::
+   :local:
+
 Usage
 =====
 
 Go to 'Inventory > Master Data > Reordering Rules' and indicate a Procurement
 Location.
 
-
-.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
-   :alt: Try me on Runbot
-   :target: https://runbot.odoo-community.org/runbot/153/11.0
-
 Bug Tracker
 ===========
 
-Bugs are tracked on `GitHub Issues
-<https://github.com/OCA/stock-logistics-warehouse/issues>`_. In case of trouble, please
-check there if your issue has already been reported. If you spotted it first,
-help us smashing it by providing a detailed and welcomed feedback.
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/stock-logistics-warehouse/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_orderpoint_procure_location%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
 
 Credits
 =======
 
-Images
-------
+Authors
+~~~~~~~
 
-* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
+* ForgeFlow
 
 Contributors
-------------
+~~~~~~~~~~~~
+
+* ForgeFlow S.L. <contact@forgeflow.com>
 
-* Aaron Henriquez <ahenriquez@forgeflow.com>
+  - Aaron Henriquez <aaron.henriquez@forgeflow.com>
 
-Maintainer
-----------
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
 
 .. image:: https://odoo-community.org/logo.png
    :alt: Odoo Community Association
    :target: https://odoo-community.org
 
-This module is maintained by the OCA.
-
 OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-To contribute to this module, please visit https://odoo-community.org.
+.. |maintainer-AaronHForgeFlow| image:: https://github.com/AaronHForgeFlow.png?size=40px
+    :target: https://github.com/AaronHForgeFlow
+    :alt: AaronHForgeFlow
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-AaronHForgeFlow| 
+
+This module is part of the `OCA/stock-logistics-warehouse <https://github.com/OCA/stock-logistics-warehouse/tree/15.0/stock_orderpoint_procure_location>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

stock_orderpoint_procure_location/__manifest__.py

@@ -1,16 +1,17 @@
-# Copyright 2020 ForgeFlow S.L.
+# Copyright 2020-22 ForgeFlow S.L.
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 {
     "name": "Stock Orderpoint Procure Location",
     "summary": "Allows to create procurement orders in a different location"
     "the orderpoint",
-    "version": "13.0.1.0.0",
+    "version": "15.0.1.0.0",
     "author": "ForgeFlow, " "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/stock-logistics-warehouse",
     "category": "Warehouse Management",
-    "depends": ["purchase", "stock"],
+    "depends": ["purchase_stock"],
     "data": ["views/stock_warehouse_orderpoint_view.xml"],
     "license": "AGPL-3",
     "development_status": "Beta",
+    "maintainers": ["AaronHForgeFlow"],
     "installable": True,
 }

stock_orderpoint_procure_location/models/__init__.py

@@ -2,3 +2,4 @@
 
 from . import stock_warehouse_orderpoint
 from . import procurement_group
+from . import purchase_order_line

stock_orderpoint_procure_location/models/procurement_group.py

@@ -1,4 +1,4 @@
-# Copyright 2020 ForgeFlow S.L.
+# Copyright 2020-22 ForgeFlow S.L.
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 from odoo import api, models
@@ -8,7 +8,8 @@ class ProcurementGroup(models.Model):
     _inherit = "procurement.group"
 
     @api.model
-    def run(self, procurements):
-        if procurements and "procure_location_id" in procurements:
-            procurements["location_id"] = procurements.get("procure_location_id")
-        return super(ProcurementGroup, self).run(procurements)
+    def _get_rule(self, product_id, location_id, values):
+        procure_location = values.get("procure_location_id", False)
+        if procure_location:
+            location_id = procure_location
+        return super()._get_rule(product_id, location_id, values)

stock_orderpoint_procure_location/models/purchase_order_line.py

@@ -0,0 +1,17 @@
+# Copyright 2022 ForgeFlow S.L.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+from odoo import models
+
+
+class PurchaseOrderLine(models.Model):
+    _inherit = "purchase.order.line"
+
+    def _prepare_stock_move_vals(
+        self, picking, price_unit, product_uom_qty, product_uom
+    ):
+        res = super()._prepare_stock_move_vals(
+            picking, price_unit, product_uom_qty, product_uom
+        )
+        if self.orderpoint_id and self.orderpoint_id.procure_location_id:
+            res["location_dest_id"] = self.orderpoint_id.procure_location_id.id
+        return res

stock_orderpoint_procure_location/models/stock_warehouse_orderpoint.py

@@ -1,4 +1,4 @@
-# Copyright 2020 ForgeFlow S.L.
+# Copyright 2020-22 ForgeFlow S.L.
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 from odoo import fields, models
@@ -13,11 +13,32 @@ class Orderpoint(models.Model):
         domain="[('usage', '=', 'internal')]",
     )
 
-    def _prepare_procurement_values(self, product_qty, date=False, group=False):
+    def _prepare_procurement_values(self, date=False, group=False):
         """Set the procure location"""
-        res = super(Orderpoint, self)._prepare_procurement_values(
-            product_qty, date, group
-        )
+        res = super(Orderpoint, self)._prepare_procurement_values(date, group)
         if self.procure_location_id:
             res["procure_location_id"] = self.procure_location_id
         return res
+
+    def _quantity_in_progress(self):
+        res = super()._quantity_in_progress()
+        not_count_states = ["done", "cancel"]
+        for orderpoint in self:
+            for sm in (
+                self.env["purchase.order.line"]
+                .search(
+                    [
+                        ("state", "=", "purchase"),
+                        ("product_id", "=", orderpoint.product_id.id),
+                    ]
+                )
+                .mapped("move_ids")
+                .filtered(
+                    lambda m: m.location_dest_id == orderpoint.procure_location_id
+                    and m.state not in not_count_states
+                )
+            ):
+                res[orderpoint.id] += sm.product_uom._compute_quantity(
+                    sm.product_qty, sm.product_uom, round=False
+                )
+        return res

stock_orderpoint_procure_location/readme/CONTRIBUTORS.rst

@@ -0,0 +1,3 @@
+* ForgeFlow S.L. <contact@forgeflow.com>
+
+  - Aaron Henriquez <aaron.henriquez@forgeflow.com>

stock_orderpoint_procure_location/readme/DESCRIPTION.rst

@@ -0,0 +1,7 @@
+This module allows users to define the procure location to be used
+in procurements created from minimum stock rules.
+
+A typical use case would be the procurement location is Input location. And
+the movement to stock is created either manually or through a push rule.
+Thus I need to take into account the qty in stock but I prefer to receive in
+input location first.

stock_orderpoint_procure_location/readme/USAGE.rst

@@ -0,0 +1,2 @@
+Go to 'Inventory > Master Data > Reordering Rules' and indicate a Procurement
+Location.