[MIG] purchase_order_secondary_unit: Migration to 17.0

[IMP] purchase_order_secondary_unit: pre-commit auto fixes [IMP] purchase_order_secondary_unit: pre-commit auto fixes [DON'T MERGE] test-requirements.txt [Don't MERGE] Remove dependency
OCA · Sep 26, 2024 · 6f4471c · 6f4471c
1 parent 581d32d
commit 6f4471c
Show file tree

Hide file tree

Showing 12 changed files with 78 additions and 62 deletions.
diff --git a/purchase_order_secondary_unit/README.rst b/purchase_order_secondary_unit/README.rst
@@ -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/15.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-15-0/purchase-workflow-15-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=15.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:%2015.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,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/15.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.
diff --git a/purchase_order_secondary_unit/__manifest__.py b/purchase_order_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Purchase Order Secondary Unit",
     "summary": "Purchase product in a secondary unit",
-    "version": "15.0.1.3.0",
+    "version": "17.0.1.0.0",
     "development_status": "Beta",
     "category": "Purchase",
     "website": "https://github.com/OCA/purchase-workflow",

diff --git a/purchase_order_secondary_unit/models/purchase_order.py b/purchase_order_secondary_unit/models/purchase_order.py
@@ -12,15 +12,14 @@ class PurchaseOrderLine(models.Model):
     }
     _product_uom_field = "uom_po_id"
 
-    product_qty = fields.Float(
-        store=True, readonly=False, compute="_compute_product_qty", copy=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")
     def _compute_product_qty(self):
-        if hasattr(super(), "_compute_product_qty"):
-            return super()._compute_product_qty()
-        return self._compute_helper_target_field_qty()
+        res = super()._compute_product_qty()
+        for line in self:
+            line._compute_helper_target_field_qty()
+        return res
 
     @api.onchange("product_uom")
     def onchange_product_uom_for_secondary(self):

diff --git a/purchase_order_secondary_unit/pyproject.toml b/purchase_order_secondary_unit/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/purchase_order_secondary_unit/readme/CONTRIBUTORS.md b/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>\>
diff --git a/purchase_order_secondary_unit/readme/CONTRIBUTORS.rst b/purchase_order_secondary_unit/readme/CONTRIBUTORS.rst
diff --git a/...der_secondary_unit/readme/DESCRIPTION.rst → ...rder_secondary_unit/readme/DESCRIPTION.md b/...der_secondary_unit/readme/DESCRIPTION.rst → ...rder_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.
diff --git a/purchase_order_secondary_unit/readme/USAGE.md b/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).
diff --git a/purchase_order_secondary_unit/readme/USAGE.rst b/purchase_order_secondary_unit/readme/USAGE.rst
diff --git a/purchase_order_secondary_unit/static/description/index.html b/purchase_order_secondary_unit/static/description/index.html
@@ -8,10 +8,11 @@
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -274,7 +275,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -368,9 +369,9 @@ <h1 class="title">Purchase Order Secondary Unit</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:6fe09534fb81482ee9e3d7e40b8be0ba40897aeb01b621beb055da2b961cf89a
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/15.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-15-0/purchase-workflow-15-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=15.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">
@@ -392,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:%2015.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">
@@ -427,11 +429,13 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <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/15.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>

diff --git a/purchase_order_secondary_unit/views/product_views.xml b/purchase_order_secondary_unit/views/product_views.xml
@@ -6,10 +6,13 @@
         <field name="name">Product template Secondary Unit</field>
         <field name="model">product.template</field>
         <field name="inherit_id" ref="product.product_template_form_view" />
-        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
         <field name="arch" type="xml">
             <field name="uom_po_id" position="after">
-                <field name="purchase_secondary_uom_id" options="{'no_create': True}" />
+                <field
+                    name="purchase_secondary_uom_id"
+                    options="{'no_create': True}"
+                    groups="uom.group_uom"
+                />
             </field>
         </field>
     </record>

diff --git a/purchase_order_secondary_unit/views/purchase_order_views.xml b/purchase_order_secondary_unit/views/purchase_order_views.xml
@@ -6,7 +6,6 @@
         <field name="name">Purchase Order Secondary Unit</field>
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.purchase_order_form" />
-        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
         <field name="arch" type="xml">
             <xpath
                 expr="//field[@name='order_line']/form//field[@name='product_qty']"
@@ -15,7 +14,8 @@
                 <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"
@@ -24,7 +24,9 @@
                                 '&amp;', ('product_tmpl_id.product_variant_ids', 'in', [product_id]),
                                          ('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"
                 />
             </xpath>
             <xpath
@@ -33,15 +35,18 @@
             >
                 <field
                     name="secondary_uom_qty"
-                    attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"
+                    groups="uom.group_uom"
+                    readonly="state in ['done', 'cancel']"
                 />
                 <field
                     name="secondary_uom_id"
                     domain="['|', ('product_id', '=', product_id),
                                 '&amp;', ('product_tmpl_id.product_variant_ids', 'in', [product_id]),
                                          ('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"
                 />
             </xpath>
         </field>