[18.0][MIG] purchase_line_procurement_group: Migration to 18.0

Author: ypapouin

purchase_line_procurement_group/README.rst

@@ -17,13 +17,13 @@ Purchase Line Procurement Group
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpurchase--workflow-lightgray.png?logo=github
-    :target: https://github.com/OCA/purchase-workflow/tree/17.0/purchase_line_procurement_group
+    :target: https://github.com/OCA/purchase-workflow/tree/18.0/purchase_line_procurement_group
     :alt: OCA/purchase-workflow
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/purchase-workflow-17-0/purchase-workflow-17-0-purchase_line_procurement_group
+    :target: https://translation.odoo-community.org/projects/purchase-workflow-18-0/purchase-workflow-18-0-purchase_line_procurement_group
     :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/purchase-workflow&target_branch=17.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/purchase-workflow&target_branch=18.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -49,7 +49,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/purchase-workflow/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/purchase-workflow/issues/new?body=module:%20purchase_line_procurement_group%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/purchase-workflow/issues/new?body=module:%20purchase_line_procurement_group%0Aversion:%2018.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.
 
@@ -64,24 +64,27 @@ Authors
 Contributors
 ------------
 
--  Akim Juillerat <[email protected]>
+- Akim Juillerat <[email protected]>
 
--  Kitti Upariphutthiphong <[email protected]>
+- Kitti Upariphutthiphong <[email protected]>
 
--  `Trobz <https://trobz.com>`__:
+- `Trobz <https://trobz.com>`__:
 
-   -  Phuc Tran <[email protected]>
-   -  Jack Le <[email protected]>
+  - Phuc Tran <[email protected]>
+  - Jack Le <[email protected]>
 
--  `Binhex <https://binhex.cloud/>`__:
+- `Binhex <https://binhex.cloud/>`__:
 
-   -  Deriman Alonso
+  - Deriman Alonso
+
+- `DEC <https://decgroupe.com/>`__:
+
+  - Yann Papouin <[email protected]>
 
 Other credits
 -------------
 
-The migration of this module from 14.0 to 16.0 was financially supported
-by Camptocamp
+
 
 Maintainers
 -----------
@@ -96,6 +99,6 @@ 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.
 
-This module is part of the `OCA/purchase-workflow <https://github.com/OCA/purchase-workflow/tree/17.0/purchase_line_procurement_group>`_ project on GitHub.
+This module is part of the `OCA/purchase-workflow <https://github.com/OCA/purchase-workflow/tree/18.0/purchase_line_procurement_group>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

purchase_line_procurement_group/__manifest__.py

@@ -3,7 +3,7 @@
 {
     "name": "Purchase Line Procurement Group",
     "summary": "Group purchase order line according to procurement group",
-    "version": "17.0.1.0.0",
+    "version": "18.0.1.0.0",
     "category": "Purchase",
     "website": "https://github.com/OCA/purchase-workflow",
     "author": "Camptocamp, Odoo Community Association (OCA)",

purchase_line_procurement_group/models/purchase_order_line.py

@@ -22,10 +22,10 @@ def _find_candidate(
         """Do not merge PO lines if procurement group is different or not set."""
         _self = self
         if "group_id" in values:
-            pg_id = values.get("group_id", False)
-            if pg_id:
+            pg_id = values["group_id"]
+            if isinstance(pg_id, models.Model):
                 pg_id = pg_id.id
-            _self = self.filtered(lambda var: var.procurement_group_id.id == pg_id)
+            _self = self.filtered(lambda pol: pol.procurement_group_id.id == pg_id)
         return super(PurchaseOrderLine, _self)._find_candidate(
             product_id=product_id,
             product_qty=product_qty,
@@ -39,18 +39,36 @@ def _find_candidate(
 
     def _prepare_stock_moves(self, picking):
         res = super()._prepare_stock_moves(picking)
-        if res and res[0] and "group_id" in res[0]:
-            res[0]["group_id"] = (
-                self.procurement_group_id.id or self.order_id.group_id.id
-            )
+        if self.procurement_group_id:
+            for vals in res:
+                if vals and "group_id" in vals:
+                    # override the procurement group with the one from the PO line
+                    vals["group_id"] = self.procurement_group_id.id
         return res
 
     def _prepare_purchase_order_line_from_procurement(
-        self, product_id, product_qty, product_uom, company_id, values, po
+        self,
+        product_id,
+        product_qty,
+        product_uom,
+        location_dest_id,
+        name,
+        origin,
+        company_id,
+        values,
+        po,
     ):
         """Add procurement group to values"""
         res = super()._prepare_purchase_order_line_from_procurement(
-            product_id, product_qty, product_uom, company_id, values, po
+            product_id,
+            product_qty,
+            product_uom,
+            location_dest_id,
+            name,
+            origin,
+            company_id,
+            values,
+            po,
         )
         procurement_group = values.get("group_id")
         if procurement_group:

purchase_line_procurement_group/readme/CONTRIBUTORS.md

@@ -2,9 +2,13 @@
 
 - Kitti Upariphutthiphong \<<[email protected]>\>
 
-- [Trobz](https://trobz.com):  
+- [Trobz](https://trobz.com):
+
   - Phuc Tran \<<[email protected]>\>
   - Jack Le \<<[email protected]>\>
 
-- [Binhex](https://binhex.cloud/):  
-  - Deriman Alonso
+- [Binhex](https://binhex.cloud/):
+  - Deriman Alonso
+
+- [DEC](https://decgroupe.com/):
+  - Yann Papouin \<<[email protected]>\>

purchase_line_procurement_group/readme/CREDITS.md

@@ -1,2 +0,0 @@
-The migration of this module from 14.0 to 16.0 was financially supported
-by Camptocamp

purchase_line_procurement_group/static/description/index.html

@@ -369,7 +369,7 @@ <h1 class="title">Purchase Line Procurement Group</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:b684c8e5da20b7ea4fc93d22766564269ca83f6e875df7e8e431b81cd82b7edc
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/purchase-workflow/tree/17.0/purchase_line_procurement_group"><img alt="OCA/purchase-workflow" src="https://img.shields.io/badge/github-OCA%2Fpurchase--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/purchase-workflow-17-0/purchase-workflow-17-0-purchase_line_procurement_group"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/purchase-workflow&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/purchase-workflow/tree/18.0/purchase_line_procurement_group"><img alt="OCA/purchase-workflow" src="https://img.shields.io/badge/github-OCA%2Fpurchase--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/purchase-workflow-18-0/purchase-workflow-18-0-purchase_line_procurement_group"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/purchase-workflow&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module changes the way procurements generate purchase order lines.
 If some procurements are run for the same products and locations, but
 have different procurement groups, these won’t be merged in the same
@@ -396,7 +396,7 @@ <h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/purchase-workflow/issues">GitHub Issues</a>.
 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
-<a class="reference external" href="https://github.com/OCA/purchase-workflow/issues/new?body=module:%20purchase_line_procurement_group%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/purchase-workflow/issues/new?body=module:%20purchase_line_procurement_group%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -421,12 +421,14 @@ <h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
 <li>Deriman Alonso</li>
 </ul>
 </li>
+<li><a class="reference external" href="https://decgroupe.com/">DEC</a>:<ul>
+<li>Yann Papouin &lt;<a class="reference external" href="mailto:ypa&#64;decgroupe.com">ypa&#64;decgroupe.com</a>&gt;</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
 <h2><a class="toc-backref" href="#toc-entry-5">Other credits</a></h2>
-<p>The migration of this module from 14.0 to 16.0 was financially supported
-by Camptocamp</p>
 </div>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
@@ -437,7 +439,7 @@ <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 <p>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.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/purchase-workflow/tree/17.0/purchase_line_procurement_group">OCA/purchase-workflow</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/purchase-workflow/tree/18.0/purchase_line_procurement_group">OCA/purchase-workflow</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

purchase_line_procurement_group/tests/test_po_line_proc_group.py

@@ -13,7 +13,7 @@ def _create_orderpoint(product, qty_min, qty_max, location):
             orderpoint_model = cls.env["stock.warehouse.orderpoint"]
             return orderpoint_model.create(
                 {
-                    "name": "OP/%s" % product.name,
+                    "name": f"OP/{product.name}",
                     "product_id": product.id,
                     "product_min_qty": qty_min,
                     "product_max_qty": qty_max,
@@ -32,7 +32,8 @@ def _create_orderpoint(product, qty_min, qty_max, location):
             .create(
                 {
                     "name": "Lighter",
-                    "type": "product",
+                    "type": "consu",
+                    "is_storable": True,
                     "purchase_ok": True,
                     "seller_ids": [
                         (

purchase_line_procurement_group/views/purchase.xml

@@ -6,10 +6,14 @@
         <field name="inherit_id" ref="purchase.purchase_order_form" />
         <field name="arch" type="xml">
             <xpath
-                expr="//notebook//field[@name='order_line']/tree/field[@name='date_planned']"
+                expr="//notebook//field[@name='order_line']/list/field[@name='date_planned']"
                 position="after"
             >
-                <field name="procurement_group_id" group_id="base.group_no_one" />
+                <field
+                    name="procurement_group_id"
+                    group_id="base.group_no_one"
+                    optional="hide"
+                />
             </xpath>
             <xpath
                 expr="//notebook//field[@name='order_line']/form//field[@name='date_planned']"