[18.0][IMP] purchase_order_secondary_unit: add vendor pricelist support

purchase_order_secondary_unit/README.rst

@@ -1,7 +1,3 @@
-.. image:: https://odoo-community.org/readme-banner-image
-   :target: https://odoo-community.org/get-involved?utm_source=readme
-   :alt: Odoo Community Association
-
 =============================
 Purchase Order Secondary Unit
 =============================
@@ -17,7 +13,7 @@ Purchase Order Secondary Unit
 .. |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/license-AGPL--3-blue.png
+.. |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%2Fpurchase--workflow-lightgray.png?logo=github
@@ -35,11 +31,25 @@ Purchase Order Secondary Unit
 This module extends the functionality of purchase orders to allow buy
 products in secondary unit of distinct category.
 
+Users can enter quantities and prices in secondary units on purchase
+order lines. Vendor pricelist records are also extended to support
+secondary unit pricing.
+
+Purchase reports and the Purchase Order portal are adjusted to display
+quantities and prices in secondary units based on company configuration.
+
 **Table of contents**
 
 .. contents::
    :local:
 
+Configuration
+=============
+
+For configuration of displaying secondary unit information in purchase
+reports and the Purchase Order portal, see the guidelines provided in
+product_secondary_unit.
+
 Usage
 =====
 
@@ -52,6 +62,24 @@ To use this module you need to:
 5. Change secondary qty and secondary uom in line, and quantity
    (product_qty) will be changed (according to the conversion factor).
 
+**Vendor Pricelist Integration**
+
+-  When adding a vendor to a product's pricelist (via *Purchase tab >
+   Vendors*), the secondary unit of measure is automatically defaulted
+   from the product variant's purchase secondary UOM, or from the
+   product template if not set on the variant.
+-  When a new vendor pricelist record is created from purchase order
+   confirmation, the secondary UOM from the purchase order line is
+   automatically stored in the vendor pricelist entry.
+
+Known issues / Roadmap
+======================
+
+Updating existing vendor pricelist records from purchase order
+confirmation does not currently support secondary UOM or secondary UOM
+pricing. This is not included in the current scope and may be considered
+in future improvements.
+
 Bug Tracker
 ===========
 
@@ -73,14 +101,17 @@ Authors
 Contributors
 ------------
 
-- `Tecnativa <https://www.tecnativa.com>`__:
+-  `Tecnativa <https://www.tecnativa.com>`__:
+
+   -  Sergio Teruel
+   -  Ernesto Tejeda
 
-  - Sergio Teruel
-  - Ernesto Tejeda
+-  Nikul Chaudhary <nikulchaudhary2112@gmail.com>
+-  Pimolnat Suntian <pimolnats@ecosoft.co.th>
+-  Miguel Ángel Gómez <miguel.gomez@braintec.com>
+-  `Quartile <https://www.quartile.co>`__:
 
-- Nikul Chaudhary <nikulchaudhary2112@gmail.com>
-- Pimolnat Suntian <pimolnats@ecosoft.co.th>
-- Miguel Ángel Gómez <miguel.gomez@braintec.com>
+   -  Yoshi Tashiro
 
 Maintainers
 -----------

purchase_order_secondary_unit/__manifest__.py

@@ -3,7 +3,7 @@
 {
     "name": "Purchase Order Secondary Unit",
     "summary": "Purchase product in a secondary unit",
-    "version": "18.0.1.0.1",
+    "version": "18.0.1.1.0",
     "development_status": "Beta",
     "category": "Purchase",
     "website": "https://github.com/OCA/purchase-workflow",
@@ -15,6 +15,8 @@
     "depends": ["purchase", "product_secondary_unit"],
     "data": [
         "views/product_views.xml",
+        "views/product_supplierinfo_views.xml",
+        "views/purchase_order_portal_templates.xml",
         "views/purchase_order_views.xml",
         "reports/purchase_order_templates.xml",
         "reports/purchase_quotation_templates.xml",

purchase_order_secondary_unit/migrations/18.0.1.1.0/pre-migrate.py

@@ -0,0 +1,17 @@
+# Copyright 2026 Quartile (https://www.quartile.co)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo.tools.sql import column_exists
+
+
+def migrate(cr, version):
+    if not column_exists(cr, "purchase_order_line", "secondary_uom_price"):
+        cr.execute("""
+            ALTER TABLE purchase_order_line
+            ADD COLUMN secondary_uom_price double precision;
+
+            UPDATE purchase_order_line pol
+            SET secondary_uom_price = pol.price_unit * su.factor
+            FROM product_secondary_unit su
+            WHERE su.id = pol.secondary_uom_id;
+        """)

purchase_order_secondary_unit/models/__init__.py

@@ -1,4 +1,5 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from . import product_product
+from . import product_supplierinfo
 from . import product_template
 from . import purchase_order

purchase_order_secondary_unit/models/product_supplierinfo.py

@@ -0,0 +1,42 @@
+# Copyright 2026 Quartile (https://www.quartile.co)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class ProductSupplierinfo(models.Model):
+    _inherit = "product.supplierinfo"
+
+    secondary_uom_id = fields.Many2one(
+        comodel_name="product.secondary.unit",
+        string="Secondary Unit",
+        domain="[('product_tmpl_id', '=', product_tmpl_id)]",
+    )
+    secondary_uom_price = fields.Float(
+        string="Secondary Price",
+        digits="Product Price",
+        compute="_compute_secondary_uom_price",
+        inverse="_inverse_secondary_uom_price",
+        store=True,
+    )
+
+    @api.depends("price", "secondary_uom_id", "secondary_uom_id.factor")
+    def _compute_secondary_uom_price(self):
+        for rec in self:
+            if rec.secondary_uom_id:
+                rec.secondary_uom_price = rec.price * rec.secondary_uom_id.factor
+            else:
+                rec.secondary_uom_price = 0.0
+
+    @api.onchange("secondary_uom_price")
+    def _inverse_secondary_uom_price(self):
+        for rec in self:
+            if rec.secondary_uom_id:
+                rec.price = rec.secondary_uom_price / rec.secondary_uom_id.factor
+
+    @api.onchange("product_tmpl_id", "product_id")
+    def _onchange_product_id_secondary_uom(self):
+        self.secondary_uom_id = (
+            self.product_id.purchase_secondary_uom_id
+            or self.product_tmpl_id.purchase_secondary_uom_id
+        )

purchase_order_secondary_unit/models/purchase_order.py

@@ -3,6 +3,15 @@
 from odoo import api, fields, models
 
 
+class PurchaseOrder(models.Model):
+    _inherit = "purchase.order"
+
+    def _prepare_supplier_info(self, partner, line, price, currency):
+        vals = super()._prepare_supplier_info(partner, line, price, currency)
+        vals["secondary_uom_id"] = line.secondary_uom_id.id
+        return vals
+
+
 class PurchaseOrderLine(models.Model):
     _inherit = ["purchase.order.line", "product.secondary.unit.mixin"]
     _name = "purchase.order.line"
@@ -25,12 +34,34 @@ class PurchaseOrderLine(models.Model):
     product_packaging_id = fields.Many2one(
         compute="_compute_product_packaging_id", store=True, precompute=True
     )
+    secondary_uom_price = fields.Float(
+        string="Secondary Price",
+        digits="Product Price",
+        aggregator="avg",
+        compute="_compute_secondary_uom_price",
+        inverse="_inverse_secondary_uom_price",
+        store=True,
+    )
 
     @api.depends("secondary_uom_qty", "secondary_uom_id")
     def _compute_product_qty(self):
         self._compute_helper_target_field_qty()
         return super()._compute_product_qty()
 
+    @api.depends("price_unit", "secondary_uom_id", "secondary_uom_id.factor")
+    def _compute_secondary_uom_price(self):
+        for rec in self:
+            if rec.secondary_uom_id:
+                rec.secondary_uom_price = rec.price_unit * rec.secondary_uom_id.factor
+            else:
+                rec.secondary_uom_price = 0.0
+
+    @api.onchange("secondary_uom_price")
+    def _inverse_secondary_uom_price(self):
+        for rec in self:
+            if rec.secondary_uom_id:
+                rec.price_unit = rec.secondary_uom_price / rec.secondary_uom_id.factor
+
     @api.onchange("product_uom")
     def onchange_product_uom_for_secondary(self):
         self._onchange_helper_product_uom_for_secondary()
@@ -54,3 +85,12 @@ def onchange_product_id(self):
         if self.secondary_uom_id:
             self.secondary_uom_qty = 1.0
         return res
+
+    def _prepare_account_move_line(self, move=False):
+        # Set secondary UoM values only when account_move_secondary_unit is installed
+        # (i.e., the fields exist on account.move.line).
+        res = super()._prepare_account_move_line(move)
+        aml_fields = self.env["account.move.line"]._fields
+        if "secondary_uom_id" in aml_fields and self.secondary_uom_id:
+            res["secondary_uom_id"] = self.secondary_uom_id.id
+        return res

purchase_order_secondary_unit/readme/CONFIGURE.md

@@ -0,0 +1,2 @@
+For configuration of displaying secondary unit information in purchase reports and
+the Purchase Order portal, see the guidelines provided in product_secondary_unit.

purchase_order_secondary_unit/readme/CONTRIBUTORS.md

@@ -4,3 +4,5 @@
 - Nikul Chaudhary \<<nikulchaudhary2112@gmail.com>\>
 - Pimolnat Suntian \<<pimolnats@ecosoft.co.th>\>
 - Miguel Ángel Gómez \<<miguel.gomez@braintec.com>\>
+- [Quartile](https://www.quartile.co):
+  - Yoshi Tashiro

purchase_order_secondary_unit/readme/DESCRIPTION.md

@@ -1,2 +1,8 @@
 This module extends the functionality of purchase orders to allow buy
 products in secondary unit of distinct category.
+
+Users can enter quantities and prices in secondary units on purchase order lines. Vendor
+pricelist records are also extended to support secondary unit pricing.
+
+Purchase reports and the Purchase Order portal are adjusted to display quantities and prices
+in secondary units based on company configuration.

purchase_order_secondary_unit/readme/ROADMAP.md

@@ -0,0 +1,3 @@
+Updating existing vendor pricelist records from purchase order confirmation does not
+currently support secondary UOM or secondary UOM pricing. This is not included in the
+current scope and may be considered in future improvements.

purchase_order_secondary_unit/readme/USAGE.md

@@ -6,3 +6,12 @@ To use this module you need to:
 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).
+
+**Vendor Pricelist Integration**
+
+-   When adding a vendor to a product's pricelist (via *Purchase tab > Vendors*), the
+    secondary unit of measure is automatically defaulted from the product variant's
+    purchase secondary UOM, or from the product template if not set on the variant.
+-   When a new vendor pricelist record is created from purchase order confirmation, the
+    secondary UOM from the purchase order line is automatically stored in the vendor
+    pricelist entry.

purchase_order_secondary_unit/reports/purchase_order_templates.xml

@@ -6,16 +6,64 @@
     >
         <!-- Header data -->
         <th name="th_quantity" position="before">
-            <th name="th_secondary_unit" class="text-end">
+            <th
+                name="th_secondary_unit"
+                class="text-end"
+                t-if="not o.company_id.hide_secondary_uom_column(o)"
+            >
                 <strong>Second Qty</strong>
             </th>
         </th>
         <!-- Content data -->
         <xpath expr="//span[@t-field='line.product_qty']/.." position="before">
-            <td id="secondary_unit" class="text-end">
+            <td
+                id="secondary_unit"
+                class="text-end"
+                t-if="not o.company_id.hide_secondary_uom_column(o)"
+            >
                 <span t-field="line.secondary_uom_qty" />
                 <span t-field="line.secondary_uom_id" />
             </td>
         </xpath>
+        <!-- Quantity: hide primary when secondary is prioritized -->
+        <xpath expr="//span[@t-field='line.product_qty']" position="attributes">
+            <attribute
+                name="t-if"
+            >line.get_secondary_uom_display_mode() != 'secondary'</attribute>
+        </xpath>
+        <xpath expr="//span[@t-field='line.product_uom.name']" position="attributes">
+            <attribute
+                name="t-if"
+            >line.get_secondary_uom_display_mode() != 'secondary'</attribute>
+        </xpath>
+        <!-- Quantity: add secondary qty ('secondary' mode) -->
+        <xpath expr="//span[@t-field='line.product_uom.name']" position="after">
+            <t t-if="line.get_secondary_uom_display_mode() == 'secondary'">
+                <span t-field="line.secondary_uom_qty" />
+                <span t-field="line.secondary_uom_id.name" />
+            </t>
+        </xpath>
+        <!-- Quantity: add secondary qty ('both' mode) -->
+        <xpath expr="//span[@t-field='line.product_qty']/.." position="inside">
+            <t t-if="line.get_secondary_uom_display_mode() == 'both'">
+                <br />
+                <span class="text-muted">
+                    (<span t-field="line.secondary_uom_qty" />
+                    <span
+                    t-field="line.secondary_uom_id.name"
+                    groups="uom.group_uom"
+                />)
+                </span>
+            </t>
+        </xpath>
+        <!-- Unit price: hide primary ('secondary' mode) -->
+        <xpath expr="//span[@t-field='line.price_unit']" position="attributes">
+            <attribute
+                name="t-if"
+            >line.get_secondary_uom_display_mode() != 'secondary'</attribute>
+        </xpath>
+        <xpath expr="//span[@t-field='line.price_unit']" position="after">
+            <t t-call="purchase_order_secondary_unit.purchase_uom_price" />
+        </xpath>
     </template>
 </odoo>