[17.0][MIG] purchase_order_secondary_unit: Migration to 17.0

purchase_order_secondary_unit/README.rst

@@ -2,7 +2,7 @@
 Purchase Order Secondary Unit
 =============================
 
-.. 
+..
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
@@ -17,19 +17,19 @@ Purchase Order Secondary Unit
     :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/16.0/purchase_order_secondary_unit
+    :target: https://github.com/OCA/purchase-workflow/tree/17.0/purchase_order_secondary_unit
     :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-16-0/purchase-workflow-16-0-purchase_order_secondary_unit
+    :target: https://translation.odoo-community.org/projects/purchase-workflow-17-0/purchase-workflow-17-0-purchase_order_secondary_unit
     :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=16.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/purchase-workflow&target_branch=17.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
 
-This module extends the functionality of purchase orders to allow buy products
-in secondary unit of distinct category.
+This module extends the functionality of purchase orders to allow buy
+products in secondary unit of distinct category.
 
 **Table of contents**
 
@@ -41,43 +41,45 @@ Usage
 
 To use this module you need to:
 
-#. Go to a *Product > General Information tab*.
-#. Create any record in "Secondary unit of measure".
-#. Set the conversion factor.
-#. Go to *Purchase > Quotation > Create*.
-#. Change secondary qty and secondary uom in line, and quantity (product_qty) will be changed (according to the conversion factor).
+1. Go to a *Product > General Information tab*.
+2. Create any record in "Secondary unit of measure".
+3. Set the conversion factor.
+4. Go to *Purchase > Quotation > Create*.
+5. Change secondary qty and secondary uom in line, and quantity
+   (product_qty) will be changed (according to the conversion factor).
 
 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_order_secondary_unit%0Aversion:%2016.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_order_secondary_unit%0Aversion:%2017.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
 =======
 
 Authors
-~~~~~~~
+-------
 
 * Tecnativa
 
 Contributors
-~~~~~~~~~~~~
+------------
 
-* `Tecnativa <https://www.tecnativa.com>`_:
+-  `Tecnativa <https://www.tecnativa.com>`__:
 
-  * Sergio Teruel
-  * Ernesto Tejeda
-* Nikul Chaudhary <nikulchaudhary2112@gmail.com>
-* Pimolnat Suntian <pimolnats@ecosoft.co.th>
-* Miguel Ángel Gómez <miguel.gomez@braintec.com>
+   -  Sergio Teruel
+   -  Ernesto Tejeda
+
+-  Nikul Chaudhary <nikulchaudhary2112@gmail.com>
+-  Pimolnat Suntian <pimolnats@ecosoft.co.th>
+-  Miguel Ángel Gómez <miguel.gomez@braintec.com>
 
 Maintainers
-~~~~~~~~~~~
+-----------
 
 This module is maintained by the OCA.
 
@@ -89,6 +91,5 @@ 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/16.0/purchase_order_secondary_unit>`_ project on GitHub.
-
+This module is part of the `OCA/purchase-workflow <https://github.com/OCA/purchase-workflow/tree/17.0/purchase_order_secondary_unit>`_ project on GitHub.
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

purchase_order_secondary_unit/__manifest__.py

@@ -3,7 +3,7 @@
 {
     "name": "Purchase Order Secondary Unit",
     "summary": "Purchase product in a secondary unit",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "development_status": "Beta",
     "category": "Purchase",
     "website": "https://github.com/OCA/purchase-workflow",

purchase_order_secondary_unit/models/purchase_order.py

@@ -12,28 +12,21 @@ class PurchaseOrderLine(models.Model):
     }
     _product_uom_field = "uom_po_id"
 
-    product_qty = fields.Float(
-        store=True,
-        readonly=False,
-        compute="_compute_product_qty",
-        copy=True,
-        precompute=True,
-    )
-    product_packaging_qty = fields.Float(
-        compute="_compute_product_packaging_qty", store=True, precompute=True
-    )
-    product_packaging_id = fields.Many2one(
-        compute="_compute_product_packaging_id", store=True, precompute=True
-    )
+    product_qty = fields.Float(copy=True)
 
-    @api.depends("secondary_uom_qty", "secondary_uom_id")
+    @api.depends("secondary_uom_qty", "secondary_uom_id", "product_packaging_qty")
+    @api.depends_context("skip_computation")
     def _compute_product_qty(self):
-        self._compute_helper_target_field_qty()
-        return super()._compute_product_qty()
+        res = super()._compute_product_qty()
+        if self.env.context.get("skip_compute_product_qty"):
+            return res
+        return self._compute_helper_target_field_qty()
 
     @api.onchange("product_uom")
     def onchange_product_uom_for_secondary(self):
-        self._onchange_helper_product_uom_for_secondary()
+        self.with_context(
+            skip_compute_product_qty=True
+        )._onchange_helper_product_uom_for_secondary()
 
     @api.onchange("product_id")
     def onchange_product_id(self):

purchase_order_secondary_unit/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"

purchase_order_secondary_unit/readme/CONTRIBUTORS.md

@@ -0,0 +1,6 @@
+- [Tecnativa](https://www.tecnativa.com):
+  - Sergio Teruel
+  - Ernesto Tejeda
+- Nikul Chaudhary \<<nikulchaudhary2112@gmail.com>\>
+- Pimolnat Suntian \<<pimolnats@ecosoft.co.th>\>
+- Miguel Ángel Gómez \<<miguel.gomez@braintec.com>\>

purchase_order_secondary_unit/readme/DESCRIPTION.rst → purchase_order_secondary_unit/readme/DESCRIPTION.md

@@ -1,2 +1,2 @@
-This module extends the functionality of purchase orders to allow buy products
-in secondary unit of distinct category.
+This module extends the functionality of purchase orders to allow buy
+products in secondary unit of distinct category.

purchase_order_secondary_unit/readme/USAGE.md

@@ -0,0 +1,8 @@
+To use this module you need to:
+
+1.  Go to a *Product \> General Information tab*.
+2.  Create any record in "Secondary unit of measure".
+3.  Set the conversion factor.
+4.  Go to *Purchase \> Quotation \> Create*.
+5.  Change secondary qty and secondary uom in line, and quantity
+    (product_qty) will be changed (according to the conversion factor).

purchase_order_secondary_unit/static/description/index.html

@@ -369,9 +369,9 @@ <h1 class="title">Purchase Order Secondary Unit</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:e1e0d0083e7a59e8f2dc6783c42dbb8368eea679e044027774bef3282b1f176f
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/16.0/purchase_order_secondary_unit"><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-16-0/purchase-workflow-16-0-purchase_order_secondary_unit"><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=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
-<p>This module extends the functionality of purchase orders to allow buy products
-in secondary unit of distinct category.</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/17.0/purchase_order_secondary_unit"><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_order_secondary_unit"><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>This module extends the functionality of purchase orders to allow buy
+products in secondary unit of distinct category.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -393,15 +393,16 @@ <h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
 <li>Create any record in “Secondary unit of measure”.</li>
 <li>Set the conversion factor.</li>
 <li>Go to <em>Purchase &gt; Quotation &gt; Create</em>.</li>
-<li>Change secondary qty and secondary uom in line, and quantity (product_qty) will be changed (according to the conversion factor).</li>
+<li>Change secondary qty and secondary uom in line, and quantity
+(product_qty) will be changed (according to the conversion factor).</li>
 </ol>
 </div>
 <div class="section" id="bug-tracker">
 <h1><a class="toc-backref" href="#toc-entry-2">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_order_secondary_unit%0Aversion:%2016.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_order_secondary_unit%0Aversion:%2017.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">
@@ -434,7 +435,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/16.0/purchase_order_secondary_unit">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/17.0/purchase_order_secondary_unit">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_order_secondary_unit/tests/test_purchase_order_secondary_unit.py

@@ -61,10 +61,8 @@ def test_purchase_order_01(self):
             self.assertEqual(line.product_qty, 7.0)
             # Test onchange product uom
             line.secondary_uom_qty = 3500.0
-            self.assertEqual(line.product_qty, 2450.0)
             line.product_uom = self.product_uom_gram
-            self.assertEqual(line.product_qty, 2450000.0)
-            self.assertEqual(line.secondary_uom_qty, 3500.0)
+            self.assertEqual(line.secondary_uom_qty, 3.5)
 
     def test_purchase_order_02(self):
         purchase_order = Form(self.order)

purchase_order_secondary_unit/views/product_views.xml

@@ -12,6 +12,7 @@
                     <field
                         name="purchase_secondary_uom_id"
                         options="{'no_create': True}"
+                        groups="uom.group_uom"
                     />
                 </t>
             </field>

purchase_order_secondary_unit/views/purchase_order_views.xml

@@ -15,16 +15,19 @@
                     <field
                         name="secondary_uom_qty"
                         class="oe_inline oe_no_button"
-                        attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"
+                        groups="uom.group_uom"
+                        readonly="state in ['done', 'cancel']"
                     />
                     <field
                         name="secondary_uom_id"
                         class="oe_inline"
-                        domain="product_id and ['|', ('product_id', '=', product_id),
+                        domain="['|', ('product_id', '=', product_id),
                                     '&amp;', ('product_tmpl_id.product_variant_ids', 'in', [product_id]),
-                                            ('product_id', '=', False)] or [(0, '=', 1)]"
+                                             ('product_id', '=', False)]"
                         options="{'no_create': True}"
-                        attrs="{'readonly': [('state', 'in', ('purchase', 'done', 'cancel'))], 'required': [('secondary_uom_qty', '!=', 0.0)]}"
+                        groups="uom.group_uom"
+                        readonly="state in ['purchase','done', 'cancel']"
+                        required="secondary_uom_qty != 0.0"
                     />
                 </t>
             </xpath>
@@ -34,8 +37,8 @@
             >
                 <field
                     name="secondary_uom_qty"
-                    attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"
                     groups="uom.group_uom"
+                    readonly="state in ['done', 'cancel']"
                     optional="show"
                 />
                 <field
@@ -44,8 +47,9 @@
                                 '&amp;', ('product_tmpl_id.product_variant_ids', 'in', [product_id]),
                                          ('product_id', '=', False)] or [(0, '=', 1)]"
                     options="{'no_create': True}"
-                    attrs="{'readonly': [('state', 'in', ('purchase','done', 'cancel'))], 'required': [('secondary_uom_qty', '!=', 0.0)]}"
                     groups="uom.group_uom"
+                    readonly="state in ['purchase','done', 'cancel']"
+                    required="secondary_uom_qty != 0.0"
                     optional="show"
                 />
             </xpath>