From 2edecc8abbbb8bb4cc7b253ef9fb15e1769a425d Mon Sep 17 00:00:00 2001
From: Sergio Teruel Albert <sergio.teruel@tecnativa.com>
Date: Thu, 11 Oct 2018 20:02:46 +0200
Subject: [PATCH 01/58] [11.0][NEW] product_secondary_unit: New module for
 setting a secondary unit for a product (#377)

---
 product_secondary_unit/README.rst             |  84 ++++
 product_secondary_unit/__init__.py            |   2 +
 product_secondary_unit/__manifest__.py        |  21 +
 product_secondary_unit/i18n/es.po             | 111 +++++
 .../i18n/product_secondary_unit.pot           | 106 +++++
 product_secondary_unit/models/__init__.py     |   3 +
 .../models/product_second_unit.py             |  47 ++
 .../models/product_template.py                |  18 +
 .../readme/CONTRIBUTORS.rst                   |   2 +
 product_secondary_unit/readme/DESCRIPTION.rst |   2 +
 product_secondary_unit/readme/USAGE.rst       |   5 +
 .../security/ir.model.access.csv              |   2 +
 .../static/description/icon.png               | Bin 0 -> 9455 bytes
 .../static/description/index.html             | 431 ++++++++++++++++++
 product_secondary_unit/tests/__init__.py      |   2 +
 .../tests/test_product_second_unit.py         |  52 +++
 .../views/product_views.xml                   |  32 ++
 17 files changed, 920 insertions(+)
 create mode 100644 product_secondary_unit/README.rst
 create mode 100644 product_secondary_unit/__init__.py
 create mode 100644 product_secondary_unit/__manifest__.py
 create mode 100644 product_secondary_unit/i18n/es.po
 create mode 100644 product_secondary_unit/i18n/product_secondary_unit.pot
 create mode 100644 product_secondary_unit/models/__init__.py
 create mode 100755 product_secondary_unit/models/product_second_unit.py
 create mode 100755 product_secondary_unit/models/product_template.py
 create mode 100644 product_secondary_unit/readme/CONTRIBUTORS.rst
 create mode 100644 product_secondary_unit/readme/DESCRIPTION.rst
 create mode 100644 product_secondary_unit/readme/USAGE.rst
 create mode 100644 product_secondary_unit/security/ir.model.access.csv
 create mode 100644 product_secondary_unit/static/description/icon.png
 create mode 100644 product_secondary_unit/static/description/index.html
 create mode 100644 product_secondary_unit/tests/__init__.py
 create mode 100644 product_secondary_unit/tests/test_product_second_unit.py
 create mode 100755 product_secondary_unit/views/product_views.xml

diff --git a/product_secondary_unit/README.rst b/product_secondary_unit/README.rst
new file mode 100644
index 00000000000..3757c47dc45
--- /dev/null
+++ b/product_secondary_unit/README.rst
@@ -0,0 +1,84 @@
+======================
+Product Secondary Unit
+======================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |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%2Fproduct--attribute-lightgray.png?logo=github
+    :target: https://github.com/OCA/product-attribute/tree/11.0/product_secondary_unit
+    :alt: OCA/product-attribute
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/product-attribute-11-0/product-attribute-11-0-product_secondary_unit
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/135/11.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+This module extends the functionality of product module to allow define
+other units with their conversion factor.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+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.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/product-attribute/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 <https://github.com/OCA/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2011.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
+~~~~~~~~~~~~
+
+* Carlos Dauden <carlos.dauden@tecnativa.com>
+* Sergio Teruel <sergio.teruel@tecnativa.com>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+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/product-attribute <https://github.com/OCA/product-attribute/tree/11.0/product_secondary_unit>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/product_secondary_unit/__init__.py b/product_secondary_unit/__init__.py
new file mode 100644
index 00000000000..3275ac2adf3
--- /dev/null
+++ b/product_secondary_unit/__init__.py
@@ -0,0 +1,2 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from . import models
diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
new file mode 100644
index 00000000000..7a04b95f739
--- /dev/null
+++ b/product_secondary_unit/__manifest__.py
@@ -0,0 +1,21 @@
+# Copyright 2018 Tecnativa - Sergio Teruel
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+{
+    'name': 'Product Secondary Unit',
+    'summary': 'Set a secondary unit per product',
+    'version': '11.0.1.0.0',
+    'development_status': 'Beta',
+    'category': 'Product',
+    'website': 'https://github.com/OCA/product-attribute',
+    'author': 'Tecnativa, Odoo Community Association (OCA)',
+    'license': 'AGPL-3',
+    'application': False,
+    'installable': True,
+    'depends': [
+        'product',
+    ],
+    'data': [
+        'security/ir.model.access.csv',
+        'views/product_views.xml',
+    ],
+}
diff --git a/product_secondary_unit/i18n/es.po b/product_secondary_unit/i18n/es.po
new file mode 100644
index 00000000000..a00fd986880
--- /dev/null
+++ b/product_secondary_unit/i18n/es.po
@@ -0,0 +1,111 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* product_secondary_unit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-09-05 10:03+0000\n"
+"PO-Revision-Date: 2018-09-05 12:05+0200\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: es_ES\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.0.6\n"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_code
+msgid "Code"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_create_uid
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_create_date
+msgid "Created on"
+msgstr "Creado en"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_product_secondary_uom_ids
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit_uom_id
+#: model:ir.model.fields,help:product_secondary_unit.field_product_template_secondary_uom_ids
+msgid "Default Secondary Unit of Measure."
+msgstr "Segunda unidad de medida por defecto"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product_sale_secondary_uom_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template_sale_secondary_uom_id
+msgid "Default unit sale"
+msgstr "Unidad de venta por defecto"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_display_name
+#, fuzzy
+msgid "Display Name"
+msgstr "Mostrar Nombre"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_id
+#, fuzzy
+msgid "ID"
+msgstr "ID"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit___last_update
+msgid "Last Modified on"
+msgstr "Última modificación en"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_write_uid
+msgid "Last Updated by"
+msgstr "Última actualización de"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_write_date
+msgid "Last Updated on"
+msgstr "Última actualización en"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_name
+msgid "Name"
+msgstr "Nombre"
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_template
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_product_tmpl_id
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_factor
+msgid "Secondary Unit Factor"
+msgstr "Factor segunda unidad"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product_secondary_uom_ids
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_uom_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template_secondary_uom_ids
+msgid "Secondary Unit of Measure"
+msgstr "Segunda unidad de medida"
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
+msgid "product.secondary.unit"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+msgid "secondary Unit"
+msgstr "Unidad Secundaria"
+
+#. module: product_secondary_unit
+#: model:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+msgid "secondary unit of measure"
+msgstr "Segunda unidad de medida"
diff --git a/product_secondary_unit/i18n/product_secondary_unit.pot b/product_secondary_unit/i18n/product_secondary_unit.pot
new file mode 100644
index 00000000000..69e6cd3a39f
--- /dev/null
+++ b/product_secondary_unit/i18n/product_secondary_unit.pot
@@ -0,0 +1,106 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* product_secondary_unit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_code
+msgid "Code"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_create_date
+msgid "Created on"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_product_secondary_uom_ids
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit_uom_id
+#: model:ir.model.fields,help:product_secondary_unit.field_product_template_secondary_uom_ids
+msgid "Default Secondary Unit of Measure."
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product_sale_secondary_uom_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template_sale_secondary_uom_id
+msgid "Default unit sale"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_id
+msgid "ID"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_name
+msgid "Name"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_template
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_product_tmpl_id
+msgid "Product Template"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_factor
+msgid "Secondary Unit Factor"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product_secondary_uom_ids
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_uom_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template_secondary_uom_ids
+msgid "Secondary Unit of Measure"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
+msgid "product.secondary.unit"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+msgid "secondary Unit"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+msgid "secondary unit of measure"
+msgstr ""
+
diff --git a/product_secondary_unit/models/__init__.py b/product_secondary_unit/models/__init__.py
new file mode 100644
index 00000000000..4775c1b3fcc
--- /dev/null
+++ b/product_secondary_unit/models/__init__.py
@@ -0,0 +1,3 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from . import product_second_unit
+from . import product_template
diff --git a/product_secondary_unit/models/product_second_unit.py b/product_secondary_unit/models/product_second_unit.py
new file mode 100755
index 00000000000..914186ad826
--- /dev/null
+++ b/product_secondary_unit/models/product_second_unit.py
@@ -0,0 +1,47 @@
+# Copyright 2018 Tecnativa - Sergio Teruel
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo import api, fields, models
+
+
+class ProductSecondaryUnit(models.Model):
+    _name = 'product.secondary.unit'
+
+    name = fields.Char(required=True)
+    code = fields.Char()
+    product_tmpl_id = fields.Many2one(
+        comodel_name='product.template',
+        string='Product Template',
+        required=True,
+    )
+    uom_id = fields.Many2one(
+        comodel_name='product.uom',
+        string='Secondary Unit of Measure',
+        required=True,
+        help="Default Secondary Unit of Measure.",
+    )
+    factor = fields.Float(
+        string='Secondary Unit Factor',
+        default=1.0,
+        digits=0,
+        required=True,
+    )
+
+    @api.multi
+    def name_get(self):
+        result = []
+        for unit in self:
+            result.append((unit.id, "{unit_name}-{factor}".format(
+                unit_name=unit.name,
+                factor=unit.factor))
+            )
+        return result
+
+    @api.model
+    def name_search(self, name='', args=None, operator='ilike', limit=100):
+        if args is None:
+            args = []
+        units = self.search([('code', '=', name)] + args, limit=1)
+        if not units:
+            return super(ProductSecondaryUnit, self).name_search(
+                name=name, args=args, operator=operator, limit=limit)
+        return units.name_get()
diff --git a/product_secondary_unit/models/product_template.py b/product_secondary_unit/models/product_template.py
new file mode 100755
index 00000000000..067316bdc60
--- /dev/null
+++ b/product_secondary_unit/models/product_template.py
@@ -0,0 +1,18 @@
+# Copyright 2018 Tecnativa - Sergio Teruel
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class ProductTemplate(models.Model):
+    _inherit = 'product.template'
+
+    secondary_uom_ids = fields.One2many(
+        comodel_name='product.secondary.unit',
+        inverse_name='product_tmpl_id',
+        string='Secondary Unit of Measure',
+        help='Default Secondary Unit of Measure.',
+    )
+    sale_secondary_uom_id = fields.Many2one(
+        comodel_name='product.secondary.unit',
+        string='Default unit sale',
+    )
diff --git a/product_secondary_unit/readme/CONTRIBUTORS.rst b/product_secondary_unit/readme/CONTRIBUTORS.rst
new file mode 100644
index 00000000000..b919cb776aa
--- /dev/null
+++ b/product_secondary_unit/readme/CONTRIBUTORS.rst
@@ -0,0 +1,2 @@
+* Carlos Dauden <carlos.dauden@tecnativa.com>
+* Sergio Teruel <sergio.teruel@tecnativa.com>
diff --git a/product_secondary_unit/readme/DESCRIPTION.rst b/product_secondary_unit/readme/DESCRIPTION.rst
new file mode 100644
index 00000000000..006bd6d63a2
--- /dev/null
+++ b/product_secondary_unit/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+This module extends the functionality of product module to allow define
+other units with their conversion factor.
diff --git a/product_secondary_unit/readme/USAGE.rst b/product_secondary_unit/readme/USAGE.rst
new file mode 100644
index 00000000000..3f837c39383
--- /dev/null
+++ b/product_secondary_unit/readme/USAGE.rst
@@ -0,0 +1,5 @@
+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.
diff --git a/product_secondary_unit/security/ir.model.access.csv b/product_secondary_unit/security/ir.model.access.csv
new file mode 100644
index 00000000000..5ca549da6e5
--- /dev/null
+++ b/product_secondary_unit/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_product_secondary_unit_user,access_product_second_unit_user,model_product_secondary_unit,base.group_user,1,1,1,1
diff --git a/product_secondary_unit/static/description/icon.png b/product_secondary_unit/static/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d
GIT binary patch
literal 9455
zcmW++2RxMjAAjx~&dlBk9S+%}OXg)AGE&Cb*&}<C%<R2Kc9faym6aW`f0Dh5$js*d
z_}}Z!;XIG;_cPz`_vag-p{7Ve$Uq1H00~A(?iu(VaQlMefnU3&OozZXm@69d91cGG
z;O61r&je0NdamH#&)mKsXk?Zb_)B^>d0jUxM@u(PQx^-s)6<jB#=*|j%+$$(&(Xyy
zYgd8+09XKwoa}S2?48%%ZU#L~n^g{fE40h%YEx5by;GuJ(K|vI1uO;0m}=J7R4@Bs
z>97TX<v{QF=s?r`z`m$a0ZvrhBU7}{15RN9M`j!kv_Mp+3~{||YNuFzHNvhMYm3=Q
zo!q+OJ5(%-oNM^I^M%*luKMiVL`lo`bcKGymX7i3MIFWj1i|9+CGNvn`cu-RsK0Qh
zoYlwB>`ehR4?GS^qbkof1cslKgk<Uw6DeIxZyT_?=OwX|lwC*A?ac*gHF7jmS080$
z>U)h65qZ9Oc=ml_0temigYLJfnz{IDzUf>bGs4N!v3=Z3jMq&A#7%rM5eQ#dc?k~!
zVpnB`o+K7|Al`Q_U<UrcmRnh6jExs}l(hZs0%T~Dnpu-NENdhioRv(T{Qmv>;eD$B
zfJtP*jH`siUq~{KE)`jP2|#TUEFGRryE2`i0**z#*^6~AI|YzIWy$Cu#CSLW3q=GA
z6`?GZymC;dCPk~rBS%eCb`5OLr;RUZ;D`}um=H)BfVIq%7VhiMr)_#G0N#zrNH|__
zc+blN2UAB0=617@>_<D4$IPL<k1zq(*VmlDPer&h1n6`AG;9A!_W=N$JthhQWXZ<i
zGURc6f<i*joK3xSWaOOXxAc8ES>u;MPHN;P;N#YoE=)R#i$k_`UAA>WWCcEVMh~L_
zj--gtp&|K1#58Yz*AHCTMziU1Jzt_jG0I@qAOHsk$2}yTmVkBp_eHuY$A9)>P6o~I
z%aQ?!(GqeQ-Y+b0I(m9pwgi(IIZZzsbMv+9w{PFtd_<_(LA~0H(xz<Z(Qt1jC2cC|
z6WbMo9YgON{L#ZDl$sV4*<CP(>{=FhLB@(1&qHA5EJw1>>=%q2f&^X>IQ{!GJ4e9U
z&KlB)z(84HmNgm2hg2C0>WM{E(DdPr+EeU_N@57;PC2&DmGFW_9kP&%?X4}+xWi)(
z;)z%wI5>D4a*5XwD)P--sPkoY(a~WBw;E~AW`Yue4kFa^LM3X`8x|}ZUeMnqr}>kH
zG%WWW>3ml$Yez?i%)2pbKPI7?5o?hydokgQyZsNEr{a|mLdt;X2TX(#B1j35xPnPW
z*bMSSOauW>o;*=kO8ojw91VX!qoOQb)zHJ!odWB}d+*K?#sY_jqPdg{Sm2HdYzdEx
zOGVPhVRTGPtv0o}RfVP;Nd(|CB)<HrC1(%ZOEd8PI?r9b_$Cp-${bh59Z_R7n&YCp
zl8lfMpes*8{FVm;oJH@0LLoWmxD59u?JwHz2iRrAaE0`Hc&g;t5~$P*kdeOZn9OJ3
zRczo@ZkWU)RG+hcfH~{49Vvb3D(W0wRX#|$cA0Iqy^VR~(4hqA2AFI-rK!FM!#fJ_
zGFI@iqJOPXZ!=VjTS3dMuu~9xU3K1&?th;$)cqM#WGxbDEyB$y`#9j%>I;*t&QO8h
zFfekr30S!-LHmV_Su-W+rEwYXJ^;6&3|L$mMC8*bQptyOo9;>Qb9Q9`ySe3%V$A*9
zeKEe+b0{#KWGp$F+tga)0RtI)nhMa-K@JS}2krK~n8vJ=Ngm?R!9G<~RyuU0d?nz#
z-5EK$o(!F?hmX*2Yt6+coY`6jGbb7t<dboft~zeDZwK=+l2bFWs5^+|r{J6GO9Cwl
z&SW58BRs?XdFLuhtzl7WLbQ#~z#`jAB3AbSUg6jW6@qVd2Q~9qN(izT1y*>F#6nHA
zuKk=GGJ;ZwON1iAfG$E#Y7MnZVmrY|j0eVI(DN_MNFJmyZ|;w4tf@=CCDZ#5N_0K=
z$;R~bbk?}TpfDjfB&aiQ$VA}s?P}xPERJG{kxk5~R`iRS(SK5d+Xs9swCozZISbnS
zk!)I0>t=A<-^z(cmSFz3=jZ23u13X><0b)P)^1T_))Kr`e!-pb#q&J*Q`p+B6la%C
zuVl&0duN<;uOsB3%T9Fp8t{ED108<?)`y_~Hnd9AUX7h-H?jVuU|}My+C=TjH(jKz
zqMVr0re3S$H@t{zI95qa)+Crz*5Zj}Ao%4Z><+W(nOZd?gDnfNBC3>M8WE61$So|P
zVvqH0SNtDTcs<xiU1;=a39$d&&l5EwoIH1db#`S9Kw!YC1jhR)VbCWMptlUUkpfif
zMzi-i8)WL?|C$*Q?iqbS{w<lA9XN(rD)VS<zn>UdzaMDpT=Ty0pDHHNL@Z0w$Y`XO
z2M-_r1S+GaH%pz#Uy0*w$Vdl=X=rQXEzO}d6J^R6zjM1u&c9vYLvLp?W7w(?np9x1
zE_0JSAJCPB%i7p*Wvg)pn5T`8k3-uR?*NT|J`eS#_#54p>!p(mLDvmc-3o0mX*mp_
zN*AeS<>#^-{S%W<*mz^!X$w_2dHWpcJ6^j64qFBft-o}o_Vx80o0>}Du;>kLts;$8
zC`7q$QI(dKYG`Wa8#wl@V4jVWBRGQ@1dr-hstpQL)Tl+aqVpGpbSfN>5i&QMXfiZ>
zaA?T1VGe?rpQ@;+pkrVdd{klI&jVS@I5_iz!=UMpTsa~mBga?1r}a<Xwa$pLotZk<
zsykXwQO37I=aXew7x=}YWiW)^p)|C#g+)an!@j?EcY8C0t)BlK#y{YLtkJ6=D6H-5
zp2*ANf@>RBm1WS;TT*s0f0lY=JBl66Upy)-k4J}lh=P^8(SXk~0xW=T9v*B|gzIhN
z>qsO7dFd~mgxAy4V?&)=5ieYq?zi?ZEoj)&2o)RLy=<bK!vY7J*RP!&i_xU}i*o6o
z?xN*1<rEe1L2HBkCSgiYM3a|4w?Bo7CJL7?Eh;9An1m$1t?h1v92<Xg2(#)bjbL|o
zH_H0}!Og=1dOBynXHu>@hbCRcfT5ji<pmK_U*~T(A$I-*rM$8-BCv{=@=7F)2pdtU
z5==tp!}A*&Xgf{F>gwtQGE{L*8<@Yd{zg;CsL5mvzfDY}P-wos_6PfprFVaeqNE%h
zKZhLtcQld;ZD+>=nqN~>GvROfueSzJD&<KAVm#0W>BE*}XfU|H&(FssBqY=hPCt`d
zH?@s2>I(|;fcW&YM6#V<T#ysvE$@4oRO>#!kUIP8$Nkdh0A(bEVj``-AAyYgwY~jB
zT|I7Bf@%;7aL7Wf4dZ%VqF$eiaC38OV6oy3Z#TER2G+fOCd9Iaoy6aLYbPTN{XRPz
z;U!V|vBf%H!}52L2gH_+j;`bTcQRXB+y9onc^wLm5wi3-Be}U>k_u>2Eg$=k!(l@I
zcCg+flakT2Nej3i0yn+g+}%NYb?ta;R<sv-KjYb}UVFjITQ)VAEWu*)Lz7*-f^A*H
z<25#Ynt~-Qh?$wWx4$1=T2`j@bKp!)3IXh(LC@)%WGW$+j(tGz(6#bGw&K0j=Np@B
zt}@t$R`z(>?(g5SnwsQ49U8Wng8d|{B+lyRcEDvR3+`O{zfmrmvFrL6acVP%yG98X
zo&+VBg@px@i)%o?dG(`T;n*$S5*rnyiR#=wW}}GsAcfyQpE|>a{=$Hjg=-*_K;UtD
z<sX7(ZJc+Q;#xP8uk`jnF@a^|TWw*55if6@@}%7lOBaGo9Ia-e?`RPQc^w^EWfhe}
zHWHTvDA+r}Xf5Yqpr;QU-88%QC9F_>#z-)AXwSRY?<M%E84!g*1GC?E>OPefw^iI+
z)AXz#PfEjlwTes|_{sB?4(O@fg0AJ^g8gP}ex9Ucf*@_^J(s_5jJV}c)s$`Myn|Kd
z$<h)Fm>6>}#q^n{4vN@+Os$m7KV+`}c%4)4pv@06af4-x5#wj!KKb%caK{A&Y#Rfs
z-po?Dcb1({W=6FKIUirH&(yg=*6aLCekcKwyfK^JN5{wcA3nhO(o}SK#!CINhI`-I
z1)6&n7O&ZmyFMuNwvEic#IiOAwNkR=u5it{B9n2sAJV5pNhar=j5`*N!Na;c7g!l$
z3aYBqUkqqTJ=Re-;)s!EOeij=7SQZ3Hq}ZRds%IM*PtM$wV<GYik+VfZene%bm(n6
z`r@rc^TVw7EN{|O7rORMlw)zt(Z#enc3joE#IIk!M)L8gk^go9E9AxiP9o#OqmvV>
z@;rlc*NRK7i3y5BETSKuumEN`Xu_8<BQ)z0!-JuC8x}?$qo8SEko}oUWNI(4h*VHO
zAi!Egy!f(o9aHs2dhSE6ki(be*&w&+WLOB<(b3T_Hide(NvVvLQV{BN|2?UJFaY*@
z9CXA5B_*8i5Bf6sn~d`R>GP1Ri=OK<SGIb#BCTo3qI#UBUg+dkR+2ilUwIg%XFV;l
z+>Q$@I^ko8>H6)4rjiG5{VBM>B|%`&&s^)jS|-_95&yc=GqjNo{zFkw%%HHhS~e=s
zD#sfS+-?*t|J!+ozP6KvtOl!R)@@-z24}`9{QaVLD^9VCSR2b`b!KC#o;Ki<+wXB6
zx3&O0LOWcg4&rv4QG0)4yb}7BFSEg~=IR5<g6yi=XozU}zReXL{rA%c`$IQAs<ObZ
zep*ITZ0C(~W*`?XH^l1t7&+qigAfY9tVJ5DH!~jY>#ZRj8kg}dS7_V&^%#Do==#`u
zpy6{ox?jWuR(;pg+f@mT>#HGWHAJRRDDDv~@(IDw&R>9643kK<aUZ^OhBu;1e6t#{
zxKehVgz`HT;A`FMivG<tq0OcrXwHUX_<$j<uk%m>#HN`!1vBJHnC+RM&yIh8{gG2q
zA%e*U3|N0XSRa~oX-3EAneep)@{h2vvd3Xvy$7og(sayr@95+e6~Xvi1tUqnIxoIH
zVWo*OwYElb#uyW{Imam6f2<eMTQj#)z8+N&ZY?tSPo%&2eVNU=4=?rlO<*9Twaxco
zEVE=Jh?_x>rGbjR!Y3`#gPqkv57dB6K^wRGxc9B(t|aYDGS=m$&S!NmCtrMMaUg(c
zc2qC=2Z`EEFMW-me5B)24AqF*bV5Dr-M5ig(l-WPS%CgaPzs6p_gnCIvTJ=Y<6!gT
zVt@AfYCzjjsMEGi=rDQHo0yc;HqoRNnNFeWZgcm?f;cp(6CNylj36DoL(?TS7eU#+
z7&mfr#y))+CJOXQKUMZ7QIdS9@#-}7y2K1{8)cCt0~-X0O!O?Qx#E4Og+;A2SjalQ
zs7r?qn0H044=sDN$SRG$arw~n=+T_DNdSrarmu)V6@|?1-ZB#hRn`uilTGPJ@fqEy
zGt(f0B+^JDP&f=r{#Y_wi#AVDf-y!RIXU^0jXsFpf>=Ji*TeqSY!H~AMbJdCGLhC)
zn7Rx+sXw6uYj;WRYrLd^5IZq@6JI1C^YkgnedZEYy<&4(z%Q$5yv#B<pkvWZft^C&
z;+zNo+VJNluxaDF!`gW+F0=MxsCQ~~#CYKa;ULfj5hTa8a6;d*(<eeQ7-ZQgz2et^
zf|7URfj;x*#HiF0wuBCOTEpbeD&kkENqolCm2#cQGHCeEC<&I3j+P6?sX?BPp4~46
zx-S~EJ>oo{AH8n$<d4loB?vL3RqXwK_COrQ6xRoWGOdFnWy(hhzrG8k;2k}8Zj&>a
zhb4Y3PWdr269&?V%uI$xMcUrMzl=;w<_nm*qr=c3Rl@i5wWB;e-`t7D&c-mcQl7x!
zZWB`UGcw=Y2=}~wzrfLx=uet<;m3~=8I~ZRuzvMQUQdr+yTV|ATf1Uuomr__nDf=X
zZ3WYJtHp_ri(}SQAPjv+Y+0=<GD??Na(2AG`s>fH4krOP@S&=zZ-t1jW1o@}z;xk8
z(Nz1co&El^HK^NrhVHa-_;&88vTU>_J33=%{if;BEY*J#1n59=07jrGQ#IP>@u#3A
z;!q+E1Rj3ZJ+!4bq9F8PXJ@yMgZL;>&gYA0%_Kbi8?S=XGM~dnQZQ!yBSgcZhY96H
zrWnU;k)qy`rX&&xlDyA%(a1Hhi5CWkmg(`Gb%m(HKi-7Z!LKGRP_B8@`7&hdDy5n=
z`OIxqxiVfX@OX1p(mQu>0Ai*v_cTMiw4qRt3~N<X{IYiJ3k=4u-u*nJEBnJ<OdI8P
zXmK`OYkO5a{YDhI3PL|H4m=p>Bvr9oBy0)r>w3p~V0SCm=An6@3n)>@z!|o-$HvDK
z|3D2ZMJkLE5loMKl6R^ez@Zz%S$&mbeoqH5`Bb){Ei21q&VP)hWS2tjShfFtGE+$z
zzCR$P#uktu+#!w)cX!<osOkId_HzAT-HD2N`M+v2l+zwdW%GgZbQMuhfE*hHjKXKg
z45hphqVETPDbX6wpTlZqza0gFaRGh`3L~0id)F6#%@9;w(e%PjzuD7@inuToA!B?F
zCMLJc!u{3N)s?lB-!11!GxXsCak8zQomO)gmn02f-5~OkMYnm~#jVwwYNw@LAv!KN
z-n`q1|AXw*TW>lWN1XU%K-r=s{|j?)Akf@q#3b#{6cZCuJ~gCxuMXRmI$nGtnH+-h
z+GEi!*X=AP<|fG`1>MBdTb?28JYc=fGvAi2I<$B(rs$;eoJCyR6_bc~p!XR@O-+sD
z=eH`-ye})I5ic1eL~TDmtfJ|8`0VJ*Yr=hNCd)G1p2MMz4C3^Mj?7;!w|Ly%JqmuW
zlIEW^Ft%z?*|fpXda>Jr^1noFZEwFgVV%|*XhH@acv8rdGxeEX{M$(vG{Zw+x(ei@
zmfXb22}8-?Fi`vo-YVrTH*C?a8%M=Hv9MqVH7H^J$KsD?>!SFZ;ZsvnHr_gn=7acz
z#W?0eCdVhVMWN12VV^$>WlQ?f;P^{(&pYTops|btm6aj>_Uz+hqpGwB)vWp0Cf5y<
zft8-je~nn?W11plq}N)4A{l8I7$!ks_x$PXW-2XaRFswX_BnF{R#6YIwMhAgd5F9X
zGmwdadS6(a^fjHtXg8=l?Rc0Sm%hk6E9!5cLVloEy4eh(=FwgP`)~I^5~pBEWo+F6
zSf2ncyMurJN91#cJTy_u8Y}@%!bq1RkGC~-bV@SXRd4F{R-*V<h953|jk-C&|3)z%
ze&_30-6q1)a0(!xXqA+_t(WC`HA_yYaW@>`bS+6;W5vZ(&+I<9$;-V|eNfLa5n-6%
z2(}&uGRF;p9<Q%jdNy1%e7XTzyu7EEQT(5LrnvX~T%K!IuDyHY`ZneVJu#k_1T)xA
z*yxB?y4!pOJ$DTZzBm|8OIQq+AtV25aJ+X5EJjAu><tfuiNClI2BSoMgqLnU-5t95
zEnZ(^g~1RgD=UMB({c;$HujG&%DqGF;5jI~roRT+(rOoS$6f6SsURIuAVkAeIVc~{
z5ZxLN%m%Z*Sg;qYCf3<$dE6~&w_!EBx%yl4YC~LH{FCFNRBc_I>2eS*sE*o<YSPrx
z{M(reV{~jKue#Y6ZOnqJia{fQc!UxV4m)l389OmzR6A3|2!i<P{r82jKw+zq4%@ny
znopi6g!1Vx9Bml#a~KdL2lp2C)qSTKIh43vgycQHfQb_I!kQY&p;X@Bz|{^SXsW1K
zP&Ag1CW_r6u5-4=s(W>R$@pexaqr*meB)VhmIg@h{uzkk$9~qh#cHhw#>O%)b@+(|
z^IQgqzuj~Sk(J;swEM-3TrJAPCq9k^^^`q{IItKBRXYe}e0Tdr=Huf7da3$l4<V=<
zfr<*%iOB1EY}w3tF2Cwl7a2OS&~Y-lu<s)T^9=OFU8(CeN|63BiMxf*)5gesGU<eZ
z9DigzL3+quZ1o2T<KAZbCGJx&lrl*e#}Dpv24bZO$B<Yoc5hbeP0y?@P%|Tvw||e%
zV#e^q0D2R_Oq_c+=x5vP&hg4k+df{o7$aNZCM>PdpwWDop%^}n;dD#K4s#DYA8SHZ
z&1!riV4W4R7R#C))JH1~axJ)RYnM$$lIR%6fIVA@zV{XVyx}C+a-Dt8Y9M)^KU0+H
zR4IUb2CJ{Hg>CuaXtD50jB(_Tcx=Z$^W<wsNa}nUDpNk$q{>Yu2u5kubqmwp%drJ6
z?Fo40g!Qd<-l=TQxqHEOuPX0;^z7iX?Ke^a%XT<13TA^5`4Xcw6D@Ur&VT&CUe0d}
z1GjOVF1^L@>O)l@?bD~$wzgf(nxX1OGD8fEV?TdJcZc2KoUe|oP1#=$$7ee|xbY)A
zDZq+cuTpc(fFdj^=!;{k03C69lMQ(|>uhRfRu%+!k&<F<Z7l=VnwB^RA&^APMi=Tn
zNc}%IJL~xB4OP6bJNwAw)~Ma2=UP0dhr%X=kco(it+@F<#$xrIJ8@|{Buh<)h`xg?
z_U}pe=3#zmDfdqE4`Hyn<!?&CfCp#GTeXo8;AYd1Opd&cXER8cBSOF3iFJ#XPgQVp
zZSiQf7V^Dt?ITs8aMF~e1hq0P@^oB)#byh|6q_7F1B%ST%WL~J?ySn>YOi-3|1QKB
z<?_cUy)V3go%%^l)lRa=dmY_XQG3Z{Q?52d$qG}vIe|EZbYEtrR$rh(iS)O#dU-(>
z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp
zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#<i<Zx(`=7k~{%`w&<EbG}U<
z0%E^8lyw>s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@<TSeYlROCt(gU?O((-qu
zs>QS0TEL_?njX|<LXnSC4TlId(D4W|GQ?L@$3Ue@N8p=l9-sC<=z(lPk;^sT(v2*k
zc~vp#Hp`mXjzhml2NMCh^h5)sqsan+jJ_l<a4w|G&ac02hrz8#6|kFraA~rta0}!q
zB4BE{QWY7MtxHn_xB);Avf#Lf<GG<A?Q3JVyc1p8^H}$8(Gn=_&F1!m8$sKyeue+L
z5&392wm+wO;_oXoTEJ=wxVXk}dt<d~CgUUMW_PPTe(c<7n18#mVaX)vK}-PzZq7<b
zNJbVTFaq(8ZLx|A*G$H3ugT2aVziDEGa66FVt@hr1|D{RWN6yuqlglM!rp^YG;UpG
zrnm?ek079l3VoOU^p%f^A9Yzn8IVX?^rB4LbgJ|PONhzM_0{P?S(V$OI=u5IBjfT#
z0ntLLnhg5$0fAHJaG6HCx4X7;RmvMtE}8C>@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6#
z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f#
zuT7fv<Q3o5LspCx-RPkzLw{VsDE>jSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC
zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv!
zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8<JV*@W33SMHM;w!OmUXar{O;_8j>ul%rG
z-<zwGD)!Y{+(T{%ob~79zpXX%zulyiy1_UHWvu@YqxKAK3e9GO6Os4R0Naujn>wfS
zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9
z^zP;K#|)$`^Rb{rnH<AdQ^(;gQMcF>GH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE#
z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz
zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8<!P
zAOHj?oPbjQ%hh|vE_1IMB)43eQpeLi&)R>etW=xJvni)8eHi`H$%#zn^WJ<U7gogJ
z?A^!2J~rI78JH|Ml2EldmKY5K8;Zx(FGcBdM<5oe#G+nd6dObqz@Af%%M*aBE_pn8
zXQo2`Bw*IwvP3#1Ev<%YocpBodO9+Rw~`5*CY3{L;qf1PxV!r%NI+#Q1f8GU7$~#U
zAA9$4&g-k=8BYi*3i@0^UX}nTQVyOf)8T(}G^Ti?Vqvk~bJRR#EAQ?u`dClPxk@{;
zxvO?%jSX`2{8|^z0*C5DR1Z^>5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t
z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN
zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01F<S%GT3P{Ck&Y*^gWuie`o_g+ZNDNIV|F
z)zEe|Ij*4$H1(<RLz0($;AD3VsUJwI@liw^?fh(V?VC`Sz7h`*Q<VYlhbHJ?&h+!W
zAJC)U;Lx_QRaSNFYbyi|7+MeNTgA+Znh}qFzf>mx5XbRo6+n|pP(&nodMoap^z{~q
ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k
zQ<WB5+u#`K#~J$81)#?BuTOKLk|+S>^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG
z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff
z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1
zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO
zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}2<F#{*|k0E{$&_`~)
zkzDcsi#!7r<a8lPUCMj?{CK;e|9#-xj>6NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$
zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV(<Rzgqw(Ze!7hEGKKx((>
z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb
zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4
z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_N<mojSrG!`
zgkqx4t<XLL6ZUppvjeV9PJ6dG>hT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{
zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*<bTMtKO;_Z)R
zRSOJrd5TFO0aO%#%-sNa{`SiQ^$$1^@oUd&^lB{MKZ>vIg?@fVFSmMpaw0qtTRbx}
z({Pg?#{2`sc9)M5N$*N|4;^t$+Q<Wh^yJ?FzJ*$wiB{j;CMy+?m1MbsJo0ubR==f9
z>P?#mo<zt1E6=Ilm*nbmYmpxfAj7*m*Wh@=7|;!%(-pviW`nuCktLveet9^$*y^>v
zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22
zc2Ix|App^>v6(3L_MCU0d3W##AB<Fxl*nmny6_RsCu%1a)so}}uCXSzwY70Y@uTxK
z=5nu(N*2HDbrIcL)t_*{*84mvmV_Y9<vxHJJ;0gUdNjyW)jDb|@|j*qR8;gsMa5Ir
z02fHv=%xyN9VLv_ZLL4y|F*p$S^^T47m{aok5{rmM{$s7^Xu2!_fo1$IG6kkG_Tgx
zFfjPm3;g>0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq
zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t<
z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k
z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp
z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{}
zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N
Xviia!U7SGha1wx#SCgwmn*{w2TRX*I

literal 0
HcmV?d00001

diff --git a/product_secondary_unit/static/description/index.html b/product_secondary_unit/static/description/index.html
new file mode 100644
index 00000000000..58907ad4632
--- /dev/null
+++ b/product_secondary_unit/static/description/index.html
@@ -0,0 +1,431 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
+<title>Product Secondary Unit</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* 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 }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="product-secondary-unit">
+<h1 class="title">Product Secondary Unit</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external" 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" 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" href="https://github.com/OCA/product-attribute/tree/11.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/product-attribute-11-0/product-attribute-11-0-product_secondary_unit"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/135/11.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>This module extends the functionality of product module to allow define
+other units with their conversion factor.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#usage" id="id1">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id2">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id3">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id4">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id1">Usage</a></h1>
+<p>To use this module you need to:</p>
+<ol class="arabic simple">
+<li>Go to a <em>Product &gt; General Information tab</em>.</li>
+<li>Create any record in “Secondary unit of measure”.</li>
+<li>Set the conversion factor.</li>
+</ol>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/product-attribute/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 smashing it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2011.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">
+<h1><a class="toc-backref" href="#id3">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id4">Authors</a></h2>
+<ul class="simple">
+<li>Tecnativa</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
+<ul class="simple">
+<li>Carlos Dauden &lt;<a class="reference external" href="mailto:carlos.dauden&#64;tecnativa.com">carlos.dauden&#64;tecnativa.com</a>&gt;</li>
+<li>Sergio Teruel &lt;<a class="reference external" href="mailto:sergio.teruel&#64;tecnativa.com">sergio.teruel&#64;tecnativa.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id6">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>
+<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/product-attribute/tree/11.0/product_secondary_unit">OCA/product-attribute</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>
+</div>
+</body>
+</html>
diff --git a/product_secondary_unit/tests/__init__.py b/product_secondary_unit/tests/__init__.py
new file mode 100644
index 00000000000..62bc6773d19
--- /dev/null
+++ b/product_secondary_unit/tests/__init__.py
@@ -0,0 +1,2 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from . import test_product_second_unit
diff --git a/product_secondary_unit/tests/test_product_second_unit.py b/product_secondary_unit/tests/test_product_second_unit.py
new file mode 100644
index 00000000000..3b01607bba3
--- /dev/null
+++ b/product_secondary_unit/tests/test_product_second_unit.py
@@ -0,0 +1,52 @@
+# Copyright 2018 Tecnativa - Sergio Teruel
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo.tests import SavepointCase
+
+
+class TestProductSecondaryUnit(SavepointCase):
+    at_install = False
+    post_install = True
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.product_uom_kg = cls.env.ref('product.product_uom_kgm')
+        cls.product_uom_unit = cls.env.ref('product.product_uom_unit')
+        cls.product = cls.env['product.template'].create({
+            'name': 'test',
+            'uom_id': cls.product_uom_kg.id,
+            'uom_po_id': cls.product_uom_kg.id,
+            'secondary_uom_ids': [
+                (0, 0, {
+                    'code': 'A',
+                    'name': 'unit-700',
+                    'uom_id': cls.product_uom_unit.id,
+                    'factor': 0.7,
+                }),
+                (0, 0, {
+                    'code': 'B',
+                    'name': 'unit-900',
+                    'uom_id': cls.product_uom_unit.id,
+                    'factor': 0.9,
+                }),
+            ],
+        })
+        secondary_unit = cls.env['product.secondary.unit'].search([
+            ('product_tmpl_id', '=', cls.product.id),
+        ], limit=1)
+        cls.product.sale_secondary_uom_id = secondary_unit.id
+
+    def test_product_secondary_unit_name(self):
+        self.assertEqual(
+            self.product.sale_secondary_uom_id.name_get()[0][1],
+            'unit-700-0.7')
+
+    def test_product_secondary_unit_search(self):
+        args = [('product_tmpl_id.product_variant_ids', 'in',
+                 self.product.product_variant_ids.ids)]
+        name_get = self.env['product.secondary.unit'].name_search(
+            name='A', args=args)
+        self.assertEqual(len(name_get), 1)
+        name_get = self.env['product.secondary.unit'].name_search(
+            name='X', args=args)
+        self.assertEqual(len(name_get), 0)
diff --git a/product_secondary_unit/views/product_views.xml b/product_secondary_unit/views/product_views.xml
new file mode 100755
index 00000000000..2ef69a3b719
--- /dev/null
+++ b/product_secondary_unit/views/product_views.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2018 Tecnativa - Sergio Teruel
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <record id="product_template_form_view" model="ir.ui.view">
+        <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('product.group_uom'))]"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='uom_id']" position="after">
+                <field name="sale_secondary_uom_id"
+                       domain="[('product_tmpl_id', '=', id)]"
+                       options="{'no_create': True}"/>
+            </xpath>
+            <xpath expr="//page[@name='general_information']" position="inside">
+                <group string="secondary unit of measure">
+                    <field name="secondary_uom_ids" nolabel="1">
+                        <tree string="secondary Unit" editable="top">
+                            <field name="code"/>
+                            <field name="name"/>
+                            <field name="uom_id"/>
+                            <field name="factor"/>
+                        </tree>
+                    </field>
+                </group>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>

From a5e606959600528944b799530a005d0fa7a44edf Mon Sep 17 00:00:00 2001
From: Sergio Teruel <sergio.teruel@tecnativa.com>
Date: Thu, 25 Oct 2018 23:00:02 +0200
Subject: [PATCH 02/58] [11.0][ADD] product_secondary_unit: Add default
 secondary unit for purchases

---
 product_secondary_unit/__manifest__.py               |  2 +-
 product_secondary_unit/i18n/es.po                    | 12 ++++++++++--
 product_secondary_unit/models/product_template.py    |  4 ----
 .../tests/test_product_second_unit.py                |  7 ++-----
 product_secondary_unit/views/product_views.xml       |  5 -----
 5 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index 7a04b95f739..3eff04f5948 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Product Secondary Unit',
     'summary': 'Set a secondary unit per product',
-    'version': '11.0.1.0.0',
+    'version': '11.0.1.0.1',
     'development_status': 'Beta',
     'category': 'Product',
     'website': 'https://github.com/OCA/product-attribute',
diff --git a/product_secondary_unit/i18n/es.po b/product_secondary_unit/i18n/es.po
index a00fd986880..b8ce1848db4 100644
--- a/product_secondary_unit/i18n/es.po
+++ b/product_secondary_unit/i18n/es.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-05 10:03+0000\n"
-"PO-Revision-Date: 2018-09-05 12:05+0200\n"
+"POT-Creation-Date: 2018-10-26 10:00+0000\n"
+"PO-Revision-Date: 2018-10-26 12:01+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: es_ES\n"
@@ -39,6 +39,14 @@ msgstr "Creado en"
 msgid "Default Secondary Unit of Measure."
 msgstr "Segunda unidad de medida por defecto"
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product_purchase_secondary_uom_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template_purchase_secondary_uom_id
+#, fuzzy
+#| msgid "Default unit sale"
+msgid "Default unit purchase"
+msgstr "Unidad de venta por defecto"
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_product_sale_secondary_uom_id
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_template_sale_secondary_uom_id
diff --git a/product_secondary_unit/models/product_template.py b/product_secondary_unit/models/product_template.py
index 067316bdc60..b729a648a27 100755
--- a/product_secondary_unit/models/product_template.py
+++ b/product_secondary_unit/models/product_template.py
@@ -12,7 +12,3 @@ class ProductTemplate(models.Model):
         string='Secondary Unit of Measure',
         help='Default Secondary Unit of Measure.',
     )
-    sale_secondary_uom_id = fields.Many2one(
-        comodel_name='product.secondary.unit',
-        string='Default unit sale',
-    )
diff --git a/product_secondary_unit/tests/test_product_second_unit.py b/product_secondary_unit/tests/test_product_second_unit.py
index 3b01607bba3..f05b1bb936e 100644
--- a/product_secondary_unit/tests/test_product_second_unit.py
+++ b/product_secondary_unit/tests/test_product_second_unit.py
@@ -31,15 +31,12 @@ def setUpClass(cls):
                 }),
             ],
         })
-        secondary_unit = cls.env['product.secondary.unit'].search([
+        cls.secondary_unit = cls.env['product.secondary.unit'].search([
             ('product_tmpl_id', '=', cls.product.id),
         ], limit=1)
-        cls.product.sale_secondary_uom_id = secondary_unit.id
 
     def test_product_secondary_unit_name(self):
-        self.assertEqual(
-            self.product.sale_secondary_uom_id.name_get()[0][1],
-            'unit-700-0.7')
+        self.assertEqual(self.secondary_unit.name_get()[0][1], 'unit-700-0.7')
 
     def test_product_secondary_unit_search(self):
         args = [('product_tmpl_id.product_variant_ids', 'in',
diff --git a/product_secondary_unit/views/product_views.xml b/product_secondary_unit/views/product_views.xml
index 2ef69a3b719..c0f2817b410 100755
--- a/product_secondary_unit/views/product_views.xml
+++ b/product_secondary_unit/views/product_views.xml
@@ -9,11 +9,6 @@
         <field name="inherit_id" ref="product.product_template_form_view"/>
         <field name="groups_id" eval="[(4, ref('product.group_uom'))]"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='uom_id']" position="after">
-                <field name="sale_secondary_uom_id"
-                       domain="[('product_tmpl_id', '=', id)]"
-                       options="{'no_create': True}"/>
-            </xpath>
             <xpath expr="//page[@name='general_information']" position="inside">
                 <group string="secondary unit of measure">
                     <field name="secondary_uom_ids" nolabel="1">

From 0d7a93703e1ea9e4a2ab57b7172de7e2329cd1c8 Mon Sep 17 00:00:00 2001
From: William Olhasque <william.olhasque@scopea.fr>
Date: Mon, 5 Nov 2018 11:07:01 +0000
Subject: [PATCH 03/58] Added translation using Weblate (French)

---
 product_secondary_unit/i18n/es.po             |  22 ++--
 product_secondary_unit/i18n/fr.po             | 105 ++++++++++++++++++
 .../i18n/product_secondary_unit.pot           |   6 -
 3 files changed, 113 insertions(+), 20 deletions(-)
 create mode 100644 product_secondary_unit/i18n/fr.po

diff --git a/product_secondary_unit/i18n/es.po b/product_secondary_unit/i18n/es.po
index b8ce1848db4..7d785cfa001 100644
--- a/product_secondary_unit/i18n/es.po
+++ b/product_secondary_unit/i18n/es.po
@@ -39,20 +39,6 @@ msgstr "Creado en"
 msgid "Default Secondary Unit of Measure."
 msgstr "Segunda unidad de medida por defecto"
 
-#. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product_purchase_secondary_uom_id
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template_purchase_secondary_uom_id
-#, fuzzy
-#| msgid "Default unit sale"
-msgid "Default unit purchase"
-msgstr "Unidad de venta por defecto"
-
-#. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product_sale_secondary_uom_id
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template_sale_secondary_uom_id
-msgid "Default unit sale"
-msgstr "Unidad de venta por defecto"
-
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_display_name
 #, fuzzy
@@ -117,3 +103,11 @@ msgstr "Unidad Secundaria"
 #: model:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
 msgid "secondary unit of measure"
 msgstr "Segunda unidad de medida"
+
+#~ msgid "Default unit sale"
+#~ msgstr "Unidad de venta por defecto"
+
+#, fuzzy
+#~| msgid "Default unit sale"
+#~ msgid "Default unit purchase"
+#~ msgstr "Unidad de venta por defecto"
diff --git a/product_secondary_unit/i18n/fr.po b/product_secondary_unit/i18n/fr.po
new file mode 100644
index 00000000000..74937bceb58
--- /dev/null
+++ b/product_secondary_unit/i18n/fr.po
@@ -0,0 +1,105 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* product_secondary_unit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2018-11-06 11:25+0000\n"
+"Last-Translator: William Olhasque <william.olhasque@scopea.fr>\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 3.2.2\n"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_code
+msgid "Code"
+msgstr "Code"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_create_uid
+msgid "Created by"
+msgstr "Créé par"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_create_date
+msgid "Created on"
+msgstr "Créé le"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_product_secondary_uom_ids
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit_uom_id
+#: model:ir.model.fields,help:product_secondary_unit.field_product_template_secondary_uom_ids
+msgid "Default Secondary Unit of Measure."
+msgstr "Unité de mesure secondaire par défaut."
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_display_name
+msgid "Display Name"
+msgstr "Nom affiché"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_id
+msgid "ID"
+msgstr "ID"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit___last_update
+msgid "Last Modified on"
+msgstr "Dernière Modification le"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_write_uid
+msgid "Last Updated by"
+msgstr "Dernière mise à jour par"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_write_date
+msgid "Last Updated on"
+msgstr "Dernière mise à jour le"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_name
+msgid "Name"
+msgstr "Nom"
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_template
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_product_tmpl_id
+msgid "Product Template"
+msgstr "Modèle de produit"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_factor
+msgid "Secondary Unit Factor"
+msgstr "Facteur de l'unité secondaire"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product_secondary_uom_ids
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_uom_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template_secondary_uom_ids
+msgid "Secondary Unit of Measure"
+msgstr "Unité de mesure secondaire"
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
+msgid "product.secondary.unit"
+msgstr "product.secondary.unit"
+
+#. module: product_secondary_unit
+#: model:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+msgid "secondary Unit"
+msgstr "Unité secondaire"
+
+#. module: product_secondary_unit
+#: model:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+msgid "secondary unit of measure"
+msgstr "Unité de mesure secondaire"
+
+#~ msgid "Default unit sale"
+#~ msgstr "Unité de vente par défaut"
diff --git a/product_secondary_unit/i18n/product_secondary_unit.pot b/product_secondary_unit/i18n/product_secondary_unit.pot
index 69e6cd3a39f..aeb44245bbf 100644
--- a/product_secondary_unit/i18n/product_secondary_unit.pot
+++ b/product_secondary_unit/i18n/product_secondary_unit.pot
@@ -35,12 +35,6 @@ msgstr ""
 msgid "Default Secondary Unit of Measure."
 msgstr ""
 
-#. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product_sale_secondary_uom_id
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template_sale_secondary_uom_id
-msgid "Default unit sale"
-msgstr ""
-
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_display_name
 msgid "Display Name"

From 76214ab9866b94610460bdb677425408db1f3a50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marta=20V=C3=A1zquez=20Rodr=C3=ADguez?=
 <vazrodmar@gmail.com>
Date: Fri, 8 Feb 2019 11:19:26 +0000
Subject: [PATCH 04/58] Translated using Weblate (Spanish)

Currently translated at 100.0% (16 of 16 strings)

Translation: product-attribute-11.0/product-attribute-11.0-product_secondary_unit
Translate-URL: https://translation.odoo-community.org/projects/product-attribute-11-0/product-attribute-11-0-product_secondary_unit/es/
---
 product_secondary_unit/i18n/es.po | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/product_secondary_unit/i18n/es.po b/product_secondary_unit/i18n/es.po
index 7d785cfa001..c38d4b91d19 100644
--- a/product_secondary_unit/i18n/es.po
+++ b/product_secondary_unit/i18n/es.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-26 10:00+0000\n"
-"PO-Revision-Date: 2018-10-26 12:01+0200\n"
-"Last-Translator: \n"
+"PO-Revision-Date: 2019-02-08 13:50+0000\n"
+"Last-Translator: Marta Vázquez Rodríguez <vazrodmar@gmail.com>\n"
 "Language-Team: \n"
-"Language: es_ES\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.6\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.4\n"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_code
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_create_uid
@@ -37,19 +37,17 @@ msgstr "Creado en"
 #: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit_uom_id
 #: model:ir.model.fields,help:product_secondary_unit.field_product_template_secondary_uom_ids
 msgid "Default Secondary Unit of Measure."
-msgstr "Segunda unidad de medida por defecto"
+msgstr "Segunda unidad de medida por defecto."
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_display_name
-#, fuzzy
 msgid "Display Name"
-msgstr "Mostrar Nombre"
+msgstr "Mostrar nombre"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_id
-#, fuzzy
 msgid "ID"
-msgstr "ID"
+msgstr "ID (Identificador)"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit___last_update
@@ -92,7 +90,7 @@ msgstr "Segunda unidad de medida"
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
 msgid "product.secondary.unit"
-msgstr ""
+msgstr "'product.secondary.unit'"
 
 #. module: product_secondary_unit
 #: model:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view

From 67b5d4a3d535874f8257165ac70bbd600455ce06 Mon Sep 17 00:00:00 2001
From: Sergio Teruel <sergio.teruel@tecnativa.com>
Date: Wed, 13 Mar 2019 15:43:15 +0100
Subject: [PATCH 05/58] [11.0][IMP] product_secondary_unit: Make secondary unit
 name translatable

---
 product_secondary_unit/models/product_second_unit.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/product_secondary_unit/models/product_second_unit.py b/product_secondary_unit/models/product_second_unit.py
index 914186ad826..2d7ffc35382 100755
--- a/product_secondary_unit/models/product_second_unit.py
+++ b/product_secondary_unit/models/product_second_unit.py
@@ -6,7 +6,10 @@
 class ProductSecondaryUnit(models.Model):
     _name = 'product.secondary.unit'
 
-    name = fields.Char(required=True)
+    name = fields.Char(
+        required=True,
+        translate=True,
+    )
     code = fields.Char()
     product_tmpl_id = fields.Many2one(
         comodel_name='product.template',

From 97475c6684a04b9ab6462d7c9cd89b3c9b7a3bd3 Mon Sep 17 00:00:00 2001
From: Kitti U <kittiu@gmail.com>
Date: Thu, 4 Apr 2019 10:58:57 +0700
Subject: [PATCH 06/58] [12.0][MIG] product_secondary_unit

---
 product_secondary_unit/README.rst             | 11 ++--
 product_secondary_unit/__manifest__.py        |  2 +-
 product_secondary_unit/i18n/es.po             | 50 ++++++++++---------
 product_secondary_unit/i18n/fr.po             | 50 ++++++++++---------
 .../i18n/product_secondary_unit.pot           | 50 +++++++++----------
 .../models/product_second_unit.py             |  3 +-
 .../readme/CONTRIBUTORS.rst                   |  1 +
 .../static/description/index.html             |  9 ++--
 .../tests/test_product_second_unit.py         |  4 +-
 .../views/product_views.xml                   |  2 +-
 10 files changed, 95 insertions(+), 87 deletions(-)

diff --git a/product_secondary_unit/README.rst b/product_secondary_unit/README.rst
index 3757c47dc45..7995d463506 100644
--- a/product_secondary_unit/README.rst
+++ b/product_secondary_unit/README.rst
@@ -14,13 +14,13 @@ Product 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%2Fproduct--attribute-lightgray.png?logo=github
-    :target: https://github.com/OCA/product-attribute/tree/11.0/product_secondary_unit
+    :target: https://github.com/OCA/product-attribute/tree/12.0/product_secondary_unit
     :alt: OCA/product-attribute
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/product-attribute-11-0/product-attribute-11-0-product_secondary_unit
+    :target: https://translation.odoo-community.org/projects/product-attribute-12-0/product-attribute-12-0-product_secondary_unit
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/135/11.0
+    :target: https://runbot.odoo-community.org/runbot/135/12.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -48,7 +48,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/product-attribute/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 <https://github.com/OCA/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2012.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.
 
@@ -65,6 +65,7 @@ Contributors
 
 * Carlos Dauden <carlos.dauden@tecnativa.com>
 * Sergio Teruel <sergio.teruel@tecnativa.com>
+* Kitti Upariphutthiphong <kittiu@ecosoft.co.th>
 
 Maintainers
 ~~~~~~~~~~~
@@ -79,6 +80,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/product-attribute <https://github.com/OCA/product-attribute/tree/11.0/product_secondary_unit>`_ project on GitHub.
+This module is part of the `OCA/product-attribute <https://github.com/OCA/product-attribute/tree/12.0/product_secondary_unit>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index 3eff04f5948..0bca0932970 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Product Secondary Unit',
     'summary': 'Set a secondary unit per product',
-    'version': '11.0.1.0.1',
+    'version': '12.0.1.0.0',
     'development_status': 'Beta',
     'category': 'Product',
     'website': 'https://github.com/OCA/product-attribute',
diff --git a/product_secondary_unit/i18n/es.po b/product_secondary_unit/i18n/es.po
index c38d4b91d19..5ed405865dd 100644
--- a/product_secondary_unit/i18n/es.po
+++ b/product_secondary_unit/i18n/es.po
@@ -18,87 +18,89 @@ msgstr ""
 "X-Generator: Weblate 3.4\n"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_code
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__code
 msgid "Code"
 msgstr "Código"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_create_uid
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_create_date
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_date
 msgid "Created on"
 msgstr "Creado en"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,help:product_secondary_unit.field_product_product_secondary_uom_ids
-#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit_uom_id
-#: model:ir.model.fields,help:product_secondary_unit.field_product_template_secondary_uom_ids
+#: model:ir.model.fields,help:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,help:product_secondary_unit.field_product_template__secondary_uom_ids
 msgid "Default Secondary Unit of Measure."
 msgstr "Segunda unidad de medida por defecto."
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_display_name
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
 msgid "Display Name"
 msgstr "Mostrar nombre"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
 msgid "ID"
 msgstr "ID (Identificador)"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit___last_update
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_write_uid
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización de"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_write_date
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_date
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_name
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__name
 msgid "Name"
 msgstr "Nombre"
 
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
+#, fuzzy
+#| msgid "product.secondary.unit"
+msgid "Product Secondary Unit"
+msgstr "'product.secondary.unit'"
+
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_template
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_product_tmpl_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
 msgid "Product Template"
 msgstr "Plantilla de producto"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_factor
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__factor
 msgid "Secondary Unit Factor"
 msgstr "Factor segunda unidad"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product_secondary_uom_ids
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_uom_id
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template_secondary_uom_ids
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
 msgid "Secondary Unit of Measure"
 msgstr "Segunda unidad de medida"
 
 #. module: product_secondary_unit
-#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
-msgid "product.secondary.unit"
-msgstr "'product.secondary.unit'"
-
-#. module: product_secondary_unit
-#: model:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
 msgid "secondary Unit"
 msgstr "Unidad Secundaria"
 
 #. module: product_secondary_unit
-#: model:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
 msgid "secondary unit of measure"
 msgstr "Segunda unidad de medida"
 
diff --git a/product_secondary_unit/i18n/fr.po b/product_secondary_unit/i18n/fr.po
index 74937bceb58..658fa2536e1 100644
--- a/product_secondary_unit/i18n/fr.po
+++ b/product_secondary_unit/i18n/fr.po
@@ -17,87 +17,89 @@ msgstr ""
 "X-Generator: Weblate 3.2.2\n"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_code
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__code
 msgid "Code"
 msgstr "Code"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_create_uid
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_create_date
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_date
 msgid "Created on"
 msgstr "Créé le"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,help:product_secondary_unit.field_product_product_secondary_uom_ids
-#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit_uom_id
-#: model:ir.model.fields,help:product_secondary_unit.field_product_template_secondary_uom_ids
+#: model:ir.model.fields,help:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,help:product_secondary_unit.field_product_template__secondary_uom_ids
 msgid "Default Secondary Unit of Measure."
 msgstr "Unité de mesure secondaire par défaut."
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_display_name
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
 msgid "Display Name"
 msgstr "Nom affiché"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
 msgid "ID"
 msgstr "ID"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit___last_update
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
 msgid "Last Modified on"
 msgstr "Dernière Modification le"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_write_uid
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
 msgid "Last Updated by"
 msgstr "Dernière mise à jour par"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_write_date
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_date
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_name
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__name
 msgid "Name"
 msgstr "Nom"
 
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
+#, fuzzy
+#| msgid "product.secondary.unit"
+msgid "Product Secondary Unit"
+msgstr "product.secondary.unit"
+
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_template
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_product_tmpl_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
 msgid "Product Template"
 msgstr "Modèle de produit"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_factor
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__factor
 msgid "Secondary Unit Factor"
 msgstr "Facteur de l'unité secondaire"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product_secondary_uom_ids
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_uom_id
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template_secondary_uom_ids
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
 msgid "Secondary Unit of Measure"
 msgstr "Unité de mesure secondaire"
 
 #. module: product_secondary_unit
-#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
-msgid "product.secondary.unit"
-msgstr "product.secondary.unit"
-
-#. module: product_secondary_unit
-#: model:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
 msgid "secondary Unit"
 msgstr "Unité secondaire"
 
 #. module: product_secondary_unit
-#: model:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
 msgid "secondary unit of measure"
 msgstr "Unité de mesure secondaire"
 
diff --git a/product_secondary_unit/i18n/product_secondary_unit.pot b/product_secondary_unit/i18n/product_secondary_unit.pot
index aeb44245bbf..efb8985cb05 100644
--- a/product_secondary_unit/i18n/product_secondary_unit.pot
+++ b/product_secondary_unit/i18n/product_secondary_unit.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 11.0\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
@@ -14,87 +14,87 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_code
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__code
 msgid "Code"
 msgstr ""
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_create_uid
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_create_date
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_date
 msgid "Created on"
 msgstr ""
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,help:product_secondary_unit.field_product_product_secondary_uom_ids
-#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit_uom_id
-#: model:ir.model.fields,help:product_secondary_unit.field_product_template_secondary_uom_ids
+#: model:ir.model.fields,help:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,help:product_secondary_unit.field_product_template__secondary_uom_ids
 msgid "Default Secondary Unit of Measure."
 msgstr ""
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_display_name
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
 msgid "ID"
 msgstr ""
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit___last_update
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_write_uid
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_write_date
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_name
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__name
 msgid "Name"
 msgstr ""
 
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
+msgid "Product Secondary Unit"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_template
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_product_tmpl_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
 msgid "Product Template"
 msgstr ""
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_factor
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__factor
 msgid "Secondary Unit Factor"
 msgstr ""
 
 #. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product_secondary_uom_ids
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_uom_id
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template_secondary_uom_ids
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
 msgid "Secondary Unit of Measure"
 msgstr ""
 
 #. module: product_secondary_unit
-#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
-msgid "product.secondary.unit"
-msgstr ""
-
-#. module: product_secondary_unit
-#: model:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
 msgid "secondary Unit"
 msgstr ""
 
 #. module: product_secondary_unit
-#: model:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
 msgid "secondary unit of measure"
 msgstr ""
 
diff --git a/product_secondary_unit/models/product_second_unit.py b/product_secondary_unit/models/product_second_unit.py
index 2d7ffc35382..ee21713a676 100755
--- a/product_secondary_unit/models/product_second_unit.py
+++ b/product_secondary_unit/models/product_second_unit.py
@@ -5,6 +5,7 @@
 
 class ProductSecondaryUnit(models.Model):
     _name = 'product.secondary.unit'
+    _description = 'Product Secondary Unit'
 
     name = fields.Char(
         required=True,
@@ -17,7 +18,7 @@ class ProductSecondaryUnit(models.Model):
         required=True,
     )
     uom_id = fields.Many2one(
-        comodel_name='product.uom',
+        comodel_name='uom.uom',
         string='Secondary Unit of Measure',
         required=True,
         help="Default Secondary Unit of Measure.",
diff --git a/product_secondary_unit/readme/CONTRIBUTORS.rst b/product_secondary_unit/readme/CONTRIBUTORS.rst
index b919cb776aa..3b07d85d575 100644
--- a/product_secondary_unit/readme/CONTRIBUTORS.rst
+++ b/product_secondary_unit/readme/CONTRIBUTORS.rst
@@ -1,2 +1,3 @@
 * Carlos Dauden <carlos.dauden@tecnativa.com>
 * Sergio Teruel <sergio.teruel@tecnativa.com>
+* Kitti Upariphutthiphong <kittiu@ecosoft.co.th>
diff --git a/product_secondary_unit/static/description/index.html b/product_secondary_unit/static/description/index.html
index 58907ad4632..ccbe87ff2bf 100644
--- a/product_secondary_unit/static/description/index.html
+++ b/product_secondary_unit/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>Product Secondary Unit</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Product Secondary Unit</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" 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" 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" href="https://github.com/OCA/product-attribute/tree/11.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/product-attribute-11-0/product-attribute-11-0-product_secondary_unit"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/135/11.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" 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" 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" href="https://github.com/OCA/product-attribute/tree/12.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/product-attribute-12-0/product-attribute-12-0-product_secondary_unit"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/135/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the functionality of product module to allow define
 other units with their conversion factor.</p>
 <p><strong>Table of contents</strong></p>
@@ -397,7 +397,7 @@ <h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/product-attribute/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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2011.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/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2012.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">
@@ -413,6 +413,7 @@ <h2><a class="toc-backref" href="#id5">Contributors</a></h2>
 <ul class="simple">
 <li>Carlos Dauden &lt;<a class="reference external" href="mailto:carlos.dauden&#64;tecnativa.com">carlos.dauden&#64;tecnativa.com</a>&gt;</li>
 <li>Sergio Teruel &lt;<a class="reference external" href="mailto:sergio.teruel&#64;tecnativa.com">sergio.teruel&#64;tecnativa.com</a>&gt;</li>
+<li>Kitti Upariphutthiphong &lt;<a class="reference external" href="mailto:kittiu&#64;ecosoft.co.th">kittiu&#64;ecosoft.co.th</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -422,7 +423,7 @@ <h2><a class="toc-backref" href="#id6">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/product-attribute/tree/11.0/product_secondary_unit">OCA/product-attribute</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/product-attribute/tree/12.0/product_secondary_unit">OCA/product-attribute</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/product_secondary_unit/tests/test_product_second_unit.py b/product_secondary_unit/tests/test_product_second_unit.py
index f05b1bb936e..47d2eda74ea 100644
--- a/product_secondary_unit/tests/test_product_second_unit.py
+++ b/product_secondary_unit/tests/test_product_second_unit.py
@@ -10,8 +10,8 @@ class TestProductSecondaryUnit(SavepointCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        cls.product_uom_kg = cls.env.ref('product.product_uom_kgm')
-        cls.product_uom_unit = cls.env.ref('product.product_uom_unit')
+        cls.product_uom_kg = cls.env.ref('uom.product_uom_kgm')
+        cls.product_uom_unit = cls.env.ref('uom.product_uom_unit')
         cls.product = cls.env['product.template'].create({
             'name': 'test',
             'uom_id': cls.product_uom_kg.id,
diff --git a/product_secondary_unit/views/product_views.xml b/product_secondary_unit/views/product_views.xml
index c0f2817b410..0351ba26c42 100755
--- a/product_secondary_unit/views/product_views.xml
+++ b/product_secondary_unit/views/product_views.xml
@@ -7,7 +7,7 @@
         <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('product.group_uom'))]"/>
+        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]"/>
         <field name="arch" type="xml">
             <xpath expr="//page[@name='general_information']" position="inside">
                 <group string="secondary unit of measure">

From ca335471f0a021c6b5447f846c25a180b8ecb037 Mon Sep 17 00:00:00 2001
From: Tony Gu <tony@openerp.cn>
Date: Mon, 21 Oct 2019 11:21:02 +0000
Subject: [PATCH 07/58] Added translation using Weblate (Chinese (Simplified))

---
 product_secondary_unit/i18n/zh_CN.po | 102 +++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 product_secondary_unit/i18n/zh_CN.po

diff --git a/product_secondary_unit/i18n/zh_CN.po b/product_secondary_unit/i18n/zh_CN.po
new file mode 100644
index 00000000000..4bde169095b
--- /dev/null
+++ b/product_secondary_unit/i18n/zh_CN.po
@@ -0,0 +1,102 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* product_secondary_unit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-10-21 13:32+0000\n"
+"Last-Translator: Tony Gu <tony@openerp.cn>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 3.8\n"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__code
+msgid "Code"
+msgstr "编码"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_uid
+msgid "Created by"
+msgstr "创建者"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_date
+msgid "Created on"
+msgstr "创建于"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,help:product_secondary_unit.field_product_template__secondary_uom_ids
+msgid "Default Secondary Unit of Measure."
+msgstr "默认辅助计量单位。"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
+msgid "Display Name"
+msgstr "显示名称"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
+msgid "ID"
+msgstr "ID"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
+msgid "Last Modified on"
+msgstr "最后修改于"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
+msgid "Last Updated by"
+msgstr "最后更新者"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_date
+msgid "Last Updated on"
+msgstr "最后更新于"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__name
+msgid "Name"
+msgstr "名称"
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
+msgid "Product Secondary Unit"
+msgstr "产品辅助计量单位"
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_template
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
+msgid "Product Template"
+msgstr "产品模版"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__factor
+msgid "Secondary Unit Factor"
+msgstr "转换率"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
+msgid "Secondary Unit of Measure"
+msgstr "辅助计量单位"
+
+#. module: product_secondary_unit
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+msgid "secondary Unit"
+msgstr "辅助计量单位"
+
+#. module: product_secondary_unit
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+msgid "secondary unit of measure"
+msgstr "辅助计量单位"

From 3f9bf4f423dff3e97819da5ee9dc3fc862ae7aa2 Mon Sep 17 00:00:00 2001
From: ps-tubtim <pimolnat.s@outlook.com>
Date: Wed, 18 Dec 2019 12:15:03 +0700
Subject: [PATCH 08/58] [IMP] product_secondary_unit: black, isort

---
 product_secondary_unit/__manifest__.py        | 29 +++----
 .../models/product_second_unit.py             | 39 +++++-----
 .../models/product_template.py                | 10 +--
 .../tests/test_product_second_unit.py         | 75 +++++++++++--------
 .../views/product_views.xml                   |  0
 5 files changed, 79 insertions(+), 74 deletions(-)
 mode change 100755 => 100644 product_secondary_unit/models/product_second_unit.py
 mode change 100755 => 100644 product_secondary_unit/models/product_template.py
 mode change 100755 => 100644 product_secondary_unit/views/product_views.xml

diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index 0bca0932970..857d167a67b 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -1,21 +1,16 @@
 # Copyright 2018 Tecnativa - Sergio Teruel
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 {
-    'name': 'Product Secondary Unit',
-    'summary': 'Set a secondary unit per product',
-    'version': '12.0.1.0.0',
-    'development_status': 'Beta',
-    'category': 'Product',
-    'website': 'https://github.com/OCA/product-attribute',
-    'author': 'Tecnativa, Odoo Community Association (OCA)',
-    'license': 'AGPL-3',
-    'application': False,
-    'installable': True,
-    'depends': [
-        'product',
-    ],
-    'data': [
-        'security/ir.model.access.csv',
-        'views/product_views.xml',
-    ],
+    "name": "Product Secondary Unit",
+    "summary": "Set a secondary unit per product",
+    "version": "13.0.1.0.0",
+    "development_status": "Beta",
+    "category": "Product",
+    "website": "https://github.com/OCA/product-attribute",
+    "author": "Tecnativa, Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "application": False,
+    "installable": True,
+    "depends": ["product"],
+    "data": ["security/ir.model.access.csv", "views/product_views.xml"],
 }
diff --git a/product_secondary_unit/models/product_second_unit.py b/product_secondary_unit/models/product_second_unit.py
old mode 100755
new mode 100644
index ee21713a676..6479f99206e
--- a/product_secondary_unit/models/product_second_unit.py
+++ b/product_secondary_unit/models/product_second_unit.py
@@ -4,48 +4,45 @@
 
 
 class ProductSecondaryUnit(models.Model):
-    _name = 'product.secondary.unit'
-    _description = 'Product Secondary Unit'
+    _name = "product.secondary.unit"
+    _description = "Product Secondary Unit"
 
-    name = fields.Char(
-        required=True,
-        translate=True,
-    )
+    name = fields.Char(required=True, translate=True)
     code = fields.Char()
     product_tmpl_id = fields.Many2one(
-        comodel_name='product.template',
-        string='Product Template',
-        required=True,
+        comodel_name="product.template", string="Product Template", required=True
     )
     uom_id = fields.Many2one(
-        comodel_name='uom.uom',
-        string='Secondary Unit of Measure',
+        comodel_name="uom.uom",
+        string="Secondary Unit of Measure",
         required=True,
         help="Default Secondary Unit of Measure.",
     )
     factor = fields.Float(
-        string='Secondary Unit Factor',
-        default=1.0,
-        digits=0,
-        required=True,
+        string="Secondary Unit Factor", default=1.0, digits=0, required=True
     )
 
     @api.multi
     def name_get(self):
         result = []
         for unit in self:
-            result.append((unit.id, "{unit_name}-{factor}".format(
-                unit_name=unit.name,
-                factor=unit.factor))
+            result.append(
+                (
+                    unit.id,
+                    "{unit_name}-{factor}".format(
+                        unit_name=unit.name, factor=unit.factor
+                    ),
+                )
             )
         return result
 
     @api.model
-    def name_search(self, name='', args=None, operator='ilike', limit=100):
+    def name_search(self, name="", args=None, operator="ilike", limit=100):
         if args is None:
             args = []
-        units = self.search([('code', '=', name)] + args, limit=1)
+        units = self.search([("code", "=", name)] + args, limit=1)
         if not units:
             return super(ProductSecondaryUnit, self).name_search(
-                name=name, args=args, operator=operator, limit=limit)
+                name=name, args=args, operator=operator, limit=limit
+            )
         return units.name_get()
diff --git a/product_secondary_unit/models/product_template.py b/product_secondary_unit/models/product_template.py
old mode 100755
new mode 100644
index b729a648a27..9fb36430fc7
--- a/product_secondary_unit/models/product_template.py
+++ b/product_secondary_unit/models/product_template.py
@@ -4,11 +4,11 @@
 
 
 class ProductTemplate(models.Model):
-    _inherit = 'product.template'
+    _inherit = "product.template"
 
     secondary_uom_ids = fields.One2many(
-        comodel_name='product.secondary.unit',
-        inverse_name='product_tmpl_id',
-        string='Secondary Unit of Measure',
-        help='Default Secondary Unit of Measure.',
+        comodel_name="product.secondary.unit",
+        inverse_name="product_tmpl_id",
+        string="Secondary Unit of Measure",
+        help="Default Secondary Unit of Measure.",
     )
diff --git a/product_secondary_unit/tests/test_product_second_unit.py b/product_secondary_unit/tests/test_product_second_unit.py
index 47d2eda74ea..168d453c240 100644
--- a/product_secondary_unit/tests/test_product_second_unit.py
+++ b/product_secondary_unit/tests/test_product_second_unit.py
@@ -10,40 +10,53 @@ class TestProductSecondaryUnit(SavepointCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        cls.product_uom_kg = cls.env.ref('uom.product_uom_kgm')
-        cls.product_uom_unit = cls.env.ref('uom.product_uom_unit')
-        cls.product = cls.env['product.template'].create({
-            'name': 'test',
-            'uom_id': cls.product_uom_kg.id,
-            'uom_po_id': cls.product_uom_kg.id,
-            'secondary_uom_ids': [
-                (0, 0, {
-                    'code': 'A',
-                    'name': 'unit-700',
-                    'uom_id': cls.product_uom_unit.id,
-                    'factor': 0.7,
-                }),
-                (0, 0, {
-                    'code': 'B',
-                    'name': 'unit-900',
-                    'uom_id': cls.product_uom_unit.id,
-                    'factor': 0.9,
-                }),
-            ],
-        })
-        cls.secondary_unit = cls.env['product.secondary.unit'].search([
-            ('product_tmpl_id', '=', cls.product.id),
-        ], limit=1)
+        cls.product_uom_kg = cls.env.ref("uom.product_uom_kgm")
+        cls.product_uom_unit = cls.env.ref("uom.product_uom_unit")
+        cls.product = cls.env["product.template"].create(
+            {
+                "name": "test",
+                "uom_id": cls.product_uom_kg.id,
+                "uom_po_id": cls.product_uom_kg.id,
+                "secondary_uom_ids": [
+                    (
+                        0,
+                        0,
+                        {
+                            "code": "A",
+                            "name": "unit-700",
+                            "uom_id": cls.product_uom_unit.id,
+                            "factor": 0.7,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "code": "B",
+                            "name": "unit-900",
+                            "uom_id": cls.product_uom_unit.id,
+                            "factor": 0.9,
+                        },
+                    ),
+                ],
+            }
+        )
+        cls.secondary_unit = cls.env["product.secondary.unit"].search(
+            [("product_tmpl_id", "=", cls.product.id)], limit=1
+        )
 
     def test_product_secondary_unit_name(self):
-        self.assertEqual(self.secondary_unit.name_get()[0][1], 'unit-700-0.7')
+        self.assertEqual(self.secondary_unit.name_get()[0][1], "unit-700-0.7")
 
     def test_product_secondary_unit_search(self):
-        args = [('product_tmpl_id.product_variant_ids', 'in',
-                 self.product.product_variant_ids.ids)]
-        name_get = self.env['product.secondary.unit'].name_search(
-            name='A', args=args)
+        args = [
+            (
+                "product_tmpl_id.product_variant_ids",
+                "in",
+                self.product.product_variant_ids.ids,
+            )
+        ]
+        name_get = self.env["product.secondary.unit"].name_search(name="A", args=args)
         self.assertEqual(len(name_get), 1)
-        name_get = self.env['product.secondary.unit'].name_search(
-            name='X', args=args)
+        name_get = self.env["product.secondary.unit"].name_search(name="X", args=args)
         self.assertEqual(len(name_get), 0)
diff --git a/product_secondary_unit/views/product_views.xml b/product_secondary_unit/views/product_views.xml
old mode 100755
new mode 100644

From d9f9fecfdeee5c168c46dd92c37970642785748f Mon Sep 17 00:00:00 2001
From: ps-tubtim <pimolnat.s@outlook.com>
Date: Wed, 18 Dec 2019 12:17:28 +0700
Subject: [PATCH 09/58] [MIG] product_secondary_unit: Migration to 13.0

---
 product_secondary_unit/README.rst             | 26 ++++++++++++-------
 product_secondary_unit/__manifest__.py        |  3 ++-
 .../i18n/product_secondary_unit.pot           |  7 +++--
 .../models/product_second_unit.py             |  1 -
 .../readme/CONTRIBUTORS.rst                   |  1 +
 product_secondary_unit/readme/DESCRIPTION.rst |  3 +--
 .../static/description/index.html             | 12 +++++----
 .../tests/test_product_second_unit.py         |  6 ++---
 8 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/product_secondary_unit/README.rst b/product_secondary_unit/README.rst
index 7995d463506..c1f9d4c4ef5 100644
--- a/product_secondary_unit/README.rst
+++ b/product_secondary_unit/README.rst
@@ -7,26 +7,25 @@ Product Secondary Unit
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
     :target: https://odoo-community.org/page/development-status
-    :alt: Beta
+    :alt: Production/Stable
 .. |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%2Fproduct--attribute-lightgray.png?logo=github
-    :target: https://github.com/OCA/product-attribute/tree/12.0/product_secondary_unit
+    :target: https://github.com/OCA/product-attribute/tree/13.0/product_secondary_unit
     :alt: OCA/product-attribute
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/product-attribute-12-0/product-attribute-12-0-product_secondary_unit
+    :target: https://translation.odoo-community.org/projects/product-attribute-13-0/product-attribute-13-0-product_secondary_unit
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/135/12.0
+    :target: https://runbot.odoo-community.org/runbot/135/13.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
-This module extends the functionality of product module to allow define
-other units with their conversion factor.
+This module extends the functionality of product module to allow define other units with their conversion factor.
 
 **Table of contents**
 
@@ -48,7 +47,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/product-attribute/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 <https://github.com/OCA/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2013.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.
 
@@ -66,6 +65,7 @@ Contributors
 * Carlos Dauden <carlos.dauden@tecnativa.com>
 * Sergio Teruel <sergio.teruel@tecnativa.com>
 * Kitti Upariphutthiphong <kittiu@ecosoft.co.th>
+* Pimolnat Suntian <pimolnats@ecosoft.co.th>
 
 Maintainers
 ~~~~~~~~~~~
@@ -80,6 +80,14 @@ 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/product-attribute <https://github.com/OCA/product-attribute/tree/12.0/product_secondary_unit>`_ project on GitHub.
+.. |maintainer-sergio-teruel| image:: https://github.com/sergio-teruel.png?size=40px
+    :target: https://github.com/sergio-teruel
+    :alt: sergio-teruel
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-sergio-teruel| 
+
+This module is part of the `OCA/product-attribute <https://github.com/OCA/product-attribute/tree/13.0/product_secondary_unit>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index 857d167a67b..f3a39bab5d1 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -4,7 +4,7 @@
     "name": "Product Secondary Unit",
     "summary": "Set a secondary unit per product",
     "version": "13.0.1.0.0",
-    "development_status": "Beta",
+    "development_status": "Production/Stable",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
     "author": "Tecnativa, Odoo Community Association (OCA)",
@@ -13,4 +13,5 @@
     "installable": True,
     "depends": ["product"],
     "data": ["security/ir.model.access.csv", "views/product_views.xml"],
+    "maintainers": ["sergio-teruel"],
 }
diff --git a/product_secondary_unit/i18n/product_secondary_unit.pot b/product_secondary_unit/i18n/product_secondary_unit.pot
index efb8985cb05..d3fe073a166 100644
--- a/product_secondary_unit/i18n/product_secondary_unit.pot
+++ b/product_secondary_unit/i18n/product_secondary_unit.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* product_secondary_unit
+# 	* product_secondary_unit
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: <>\n"
+"Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -97,4 +97,3 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
 msgid "secondary unit of measure"
 msgstr ""
-
diff --git a/product_secondary_unit/models/product_second_unit.py b/product_secondary_unit/models/product_second_unit.py
index 6479f99206e..91823f91f2a 100644
--- a/product_secondary_unit/models/product_second_unit.py
+++ b/product_secondary_unit/models/product_second_unit.py
@@ -22,7 +22,6 @@ class ProductSecondaryUnit(models.Model):
         string="Secondary Unit Factor", default=1.0, digits=0, required=True
     )
 
-    @api.multi
     def name_get(self):
         result = []
         for unit in self:
diff --git a/product_secondary_unit/readme/CONTRIBUTORS.rst b/product_secondary_unit/readme/CONTRIBUTORS.rst
index 3b07d85d575..d35178a8f58 100644
--- a/product_secondary_unit/readme/CONTRIBUTORS.rst
+++ b/product_secondary_unit/readme/CONTRIBUTORS.rst
@@ -1,3 +1,4 @@
 * Carlos Dauden <carlos.dauden@tecnativa.com>
 * Sergio Teruel <sergio.teruel@tecnativa.com>
 * Kitti Upariphutthiphong <kittiu@ecosoft.co.th>
+* Pimolnat Suntian <pimolnats@ecosoft.co.th>
diff --git a/product_secondary_unit/readme/DESCRIPTION.rst b/product_secondary_unit/readme/DESCRIPTION.rst
index 006bd6d63a2..1b02bbb452e 100644
--- a/product_secondary_unit/readme/DESCRIPTION.rst
+++ b/product_secondary_unit/readme/DESCRIPTION.rst
@@ -1,2 +1 @@
-This module extends the functionality of product module to allow define
-other units with their conversion factor.
+This module extends the functionality of product module to allow define other units with their conversion factor.
diff --git a/product_secondary_unit/static/description/index.html b/product_secondary_unit/static/description/index.html
index ccbe87ff2bf..2d348f6ab19 100644
--- a/product_secondary_unit/static/description/index.html
+++ b/product_secondary_unit/static/description/index.html
@@ -367,9 +367,8 @@ <h1 class="title">Product Secondary Unit</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" 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" 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" href="https://github.com/OCA/product-attribute/tree/12.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/product-attribute-12-0/product-attribute-12-0-product_secondary_unit"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/135/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
-<p>This module extends the functionality of product module to allow define
-other units with their conversion factor.</p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" 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" href="https://github.com/OCA/product-attribute/tree/13.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/product-attribute-13-0/product-attribute-13-0-product_secondary_unit"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/135/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>This module extends the functionality of product module to allow define other units with their conversion factor.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -397,7 +396,7 @@ <h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/product-attribute/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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2012.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/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2013.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">
@@ -414,6 +413,7 @@ <h2><a class="toc-backref" href="#id5">Contributors</a></h2>
 <li>Carlos Dauden &lt;<a class="reference external" href="mailto:carlos.dauden&#64;tecnativa.com">carlos.dauden&#64;tecnativa.com</a>&gt;</li>
 <li>Sergio Teruel &lt;<a class="reference external" href="mailto:sergio.teruel&#64;tecnativa.com">sergio.teruel&#64;tecnativa.com</a>&gt;</li>
 <li>Kitti Upariphutthiphong &lt;<a class="reference external" href="mailto:kittiu&#64;ecosoft.co.th">kittiu&#64;ecosoft.co.th</a>&gt;</li>
+<li>Pimolnat Suntian &lt;<a class="reference external" href="mailto:pimolnats&#64;ecosoft.co.th">pimolnats&#64;ecosoft.co.th</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -423,7 +423,9 @@ <h2><a class="toc-backref" href="#id6">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/product-attribute/tree/12.0/product_secondary_unit">OCA/product-attribute</a> project on GitHub.</p>
+<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
+<p><a class="reference external" href="https://github.com/sergio-teruel"><img alt="sergio-teruel" src="https://github.com/sergio-teruel.png?size=40px" /></a></p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/product-attribute/tree/13.0/product_secondary_unit">OCA/product-attribute</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/product_secondary_unit/tests/test_product_second_unit.py b/product_secondary_unit/tests/test_product_second_unit.py
index 168d453c240..c8dfa256baa 100644
--- a/product_secondary_unit/tests/test_product_second_unit.py
+++ b/product_secondary_unit/tests/test_product_second_unit.py
@@ -1,12 +1,10 @@
 # Copyright 2018 Tecnativa - Sergio Teruel
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-from odoo.tests import SavepointCase
+from odoo.tests import SavepointCase, tagged
 
 
+@tagged("post_install", "-at_install")
 class TestProductSecondaryUnit(SavepointCase):
-    at_install = False
-    post_install = True
-
     @classmethod
     def setUpClass(cls):
         super().setUpClass()

From f3958195073b18bb6213a2a46a62e83c4822e471 Mon Sep 17 00:00:00 2001
From: Sergio Teruel <sergio.teruel@tecnativa.com>
Date: Wed, 11 Mar 2020 13:00:47 +0100
Subject: [PATCH 10/58] [IMP] product_secondary_unit: Remove product secondary
 units if a product is deleted

---
 product_secondary_unit/__manifest__.py           |  2 +-
 .../models/product_second_unit.py                |  5 ++++-
 product_secondary_unit/views/product_views.xml   | 16 +++++++---------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index f3a39bab5d1..d8a00516253 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Product Secondary Unit",
     "summary": "Set a secondary unit per product",
-    "version": "13.0.1.0.0",
+    "version": "13.0.1.1.0",
     "development_status": "Production/Stable",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
diff --git a/product_secondary_unit/models/product_second_unit.py b/product_secondary_unit/models/product_second_unit.py
index 91823f91f2a..967e41e501c 100644
--- a/product_secondary_unit/models/product_second_unit.py
+++ b/product_secondary_unit/models/product_second_unit.py
@@ -10,7 +10,10 @@ class ProductSecondaryUnit(models.Model):
     name = fields.Char(required=True, translate=True)
     code = fields.Char()
     product_tmpl_id = fields.Many2one(
-        comodel_name="product.template", string="Product Template", required=True
+        comodel_name="product.template",
+        string="Product Template",
+        required=True,
+        ondelete="cascade",
     )
     uom_id = fields.Many2one(
         comodel_name="uom.uom",
diff --git a/product_secondary_unit/views/product_views.xml b/product_secondary_unit/views/product_views.xml
index 0351ba26c42..636afb0a564 100644
--- a/product_secondary_unit/views/product_views.xml
+++ b/product_secondary_unit/views/product_views.xml
@@ -1,27 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2018 Tecnativa - Sergio Teruel
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
-
     <record id="product_template_form_view" model="ir.ui.view">
         <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="inherit_id" ref="product.product_template_form_view" />
+        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
         <field name="arch" type="xml">
             <xpath expr="//page[@name='general_information']" position="inside">
                 <group string="secondary unit of measure">
                     <field name="secondary_uom_ids" nolabel="1">
                         <tree string="secondary Unit" editable="top">
-                            <field name="code"/>
-                            <field name="name"/>
-                            <field name="uom_id"/>
-                            <field name="factor"/>
+                            <field name="code" />
+                            <field name="name" />
+                            <field name="uom_id" />
+                            <field name="factor" />
                         </tree>
                     </field>
                 </group>
             </xpath>
         </field>
     </record>
-
 </odoo>

From 38aa61984ebd8b669d2a94d006aaef5bb414a097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Alan=20Ramos=20Rodr=C3=ADguez?=
 <alan.ramos@jarsa.com.mx>
Date: Wed, 11 Mar 2020 14:12:33 +0000
Subject: [PATCH 11/58] Added translation using Weblate (Spanish (Mexico))

---
 product_secondary_unit/i18n/es_MX.po | 102 +++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 product_secondary_unit/i18n/es_MX.po

diff --git a/product_secondary_unit/i18n/es_MX.po b/product_secondary_unit/i18n/es_MX.po
new file mode 100644
index 00000000000..1c53972a262
--- /dev/null
+++ b/product_secondary_unit/i18n/es_MX.po
@@ -0,0 +1,102 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* product_secondary_unit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 13.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-03-11 15:57+0000\n"
+"Last-Translator: Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>\n"
+"Language-Team: none\n"
+"Language: es_MX\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.10\n"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__code
+msgid "Code"
+msgstr "Código"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_uid
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_date
+msgid "Created on"
+msgstr "Creado en"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,help:product_secondary_unit.field_product_template__secondary_uom_ids
+msgid "Default Secondary Unit of Measure."
+msgstr "Unidad de Medida Secundaria por Defecto."
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
+msgid "Display Name"
+msgstr "Nombre para Mostrar"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
+msgid "ID"
+msgstr "ID"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
+msgid "Last Modified on"
+msgstr "Última Actualización en"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
+msgid "Last Updated by"
+msgstr "Última Actualización por"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_date
+msgid "Last Updated on"
+msgstr "Última Actualización en"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__name
+msgid "Name"
+msgstr "Nombre"
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
+msgid "Product Secondary Unit"
+msgstr "Unidad de Medida Secundaria del Producto"
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_template
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
+msgid "Product Template"
+msgstr "Plantilla de Producto"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__factor
+msgid "Secondary Unit Factor"
+msgstr "Factor de Unidad Secundaria"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
+msgid "Secondary Unit of Measure"
+msgstr "Unidad de Medida Secundaria"
+
+#. module: product_secondary_unit
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+msgid "secondary Unit"
+msgstr "Unidad Secundaria"
+
+#. module: product_secondary_unit
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+msgid "secondary unit of measure"
+msgstr "unidad de medida secundaria"

From 952eaf80fd631092897d28a3689a5792ad8f602e Mon Sep 17 00:00:00 2001
From: c2cdidier <didier.donze@camptocamp.com>
Date: Wed, 22 Jul 2020 09:58:52 +0000
Subject: [PATCH 12/58] Translated using Weblate (French)

Currently translated at 100.0% (16 of 16 strings)

Translation: product-attribute-13.0/product-attribute-13.0-product_secondary_unit
Translate-URL: https://translation.odoo-community.org/projects/product-attribute-13-0/product-attribute-13-0-product_secondary_unit/fr/
---
 product_secondary_unit/i18n/fr.po | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/product_secondary_unit/i18n/fr.po b/product_secondary_unit/i18n/fr.po
index 658fa2536e1..1ff795c74b4 100644
--- a/product_secondary_unit/i18n/fr.po
+++ b/product_secondary_unit/i18n/fr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2018-11-06 11:25+0000\n"
-"Last-Translator: William Olhasque <william.olhasque@scopea.fr>\n"
+"PO-Revision-Date: 2020-07-22 11:19+0000\n"
+"Last-Translator: c2cdidier <didier.donze@camptocamp.com>\n"
 "Language-Team: none\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.2.2\n"
+"X-Generator: Weblate 3.10\n"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__code
@@ -70,10 +70,8 @@ msgstr "Nom"
 
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
-#, fuzzy
-#| msgid "product.secondary.unit"
 msgid "Product Secondary Unit"
-msgstr "product.secondary.unit"
+msgstr "Unité produit secondaire"
 
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_template

From f311a8b634de535b17779faca38186836c1f3208 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Alan=20Ramos=20Rodr=C3=ADguez?=
 <alan.ramos@jarsa.com.mx>
Date: Wed, 11 Nov 2020 19:11:17 -0600
Subject: [PATCH 13/58] [MIG] product_secondary_unit: Migration to 14.0

---
 product_secondary_unit/README.rst                     | 11 ++++++-----
 product_secondary_unit/__manifest__.py                |  2 +-
 .../i18n/product_secondary_unit.pot                   | 11 +++++------
 product_secondary_unit/readme/CONTRIBUTORS.rst        |  1 +
 product_secondary_unit/static/description/index.html  |  7 ++++---
 product_secondary_unit/views/product_views.xml        |  2 +-
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/product_secondary_unit/README.rst b/product_secondary_unit/README.rst
index c1f9d4c4ef5..1f97e2e2f0a 100644
--- a/product_secondary_unit/README.rst
+++ b/product_secondary_unit/README.rst
@@ -14,13 +14,13 @@ Product 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%2Fproduct--attribute-lightgray.png?logo=github
-    :target: https://github.com/OCA/product-attribute/tree/13.0/product_secondary_unit
+    :target: https://github.com/OCA/product-attribute/tree/14.0/product_secondary_unit
     :alt: OCA/product-attribute
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/product-attribute-13-0/product-attribute-13-0-product_secondary_unit
+    :target: https://translation.odoo-community.org/projects/product-attribute-14-0/product-attribute-14-0-product_secondary_unit
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/135/13.0
+    :target: https://runbot.odoo-community.org/runbot/135/14.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -47,7 +47,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/product-attribute/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 <https://github.com/OCA/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2014.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.
 
@@ -66,6 +66,7 @@ Contributors
 * Sergio Teruel <sergio.teruel@tecnativa.com>
 * Kitti Upariphutthiphong <kittiu@ecosoft.co.th>
 * Pimolnat Suntian <pimolnats@ecosoft.co.th>
+* Alan Ramos <alan.ramos@jarsa.com.mx>
 
 Maintainers
 ~~~~~~~~~~~
@@ -88,6 +89,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-sergio-teruel| 
 
-This module is part of the `OCA/product-attribute <https://github.com/OCA/product-attribute/tree/13.0/product_secondary_unit>`_ project on GitHub.
+This module is part of the `OCA/product-attribute <https://github.com/OCA/product-attribute/tree/14.0/product_secondary_unit>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index d8a00516253..38afd8f57aa 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Product Secondary Unit",
     "summary": "Set a secondary unit per product",
-    "version": "13.0.1.1.0",
+    "version": "14.0.1.0.0",
     "development_status": "Production/Stable",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
diff --git a/product_secondary_unit/i18n/product_secondary_unit.pot b/product_secondary_unit/i18n/product_secondary_unit.pot
index d3fe073a166..f2c019e4026 100644
--- a/product_secondary_unit/i18n/product_secondary_unit.pot
+++ b/product_secondary_unit/i18n/product_secondary_unit.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 13.0\n"
+"Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -37,16 +37,19 @@ msgstr ""
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__id
 msgid "ID"
 msgstr ""
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -85,6 +88,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_product__secondary_uom_ids
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__uom_id
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
 msgid "Secondary Unit of Measure"
 msgstr ""
 
@@ -92,8 +96,3 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
 msgid "secondary Unit"
 msgstr ""
-
-#. module: product_secondary_unit
-#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
-msgid "secondary unit of measure"
-msgstr ""
diff --git a/product_secondary_unit/readme/CONTRIBUTORS.rst b/product_secondary_unit/readme/CONTRIBUTORS.rst
index d35178a8f58..7b075b8a691 100644
--- a/product_secondary_unit/readme/CONTRIBUTORS.rst
+++ b/product_secondary_unit/readme/CONTRIBUTORS.rst
@@ -2,3 +2,4 @@
 * Sergio Teruel <sergio.teruel@tecnativa.com>
 * Kitti Upariphutthiphong <kittiu@ecosoft.co.th>
 * Pimolnat Suntian <pimolnats@ecosoft.co.th>
+* Alan Ramos <alan.ramos@jarsa.com.mx>
diff --git a/product_secondary_unit/static/description/index.html b/product_secondary_unit/static/description/index.html
index 2d348f6ab19..0372f8298ab 100644
--- a/product_secondary_unit/static/description/index.html
+++ b/product_secondary_unit/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Product Secondary Unit</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" 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" href="https://github.com/OCA/product-attribute/tree/13.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/product-attribute-13-0/product-attribute-13-0-product_secondary_unit"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/135/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" 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" href="https://github.com/OCA/product-attribute/tree/14.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/product-attribute-14-0/product-attribute-14-0-product_secondary_unit"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/135/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the functionality of product module to allow define other units with their conversion factor.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -396,7 +396,7 @@ <h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/product-attribute/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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2013.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/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2014.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">
@@ -414,6 +414,7 @@ <h2><a class="toc-backref" href="#id5">Contributors</a></h2>
 <li>Sergio Teruel &lt;<a class="reference external" href="mailto:sergio.teruel&#64;tecnativa.com">sergio.teruel&#64;tecnativa.com</a>&gt;</li>
 <li>Kitti Upariphutthiphong &lt;<a class="reference external" href="mailto:kittiu&#64;ecosoft.co.th">kittiu&#64;ecosoft.co.th</a>&gt;</li>
 <li>Pimolnat Suntian &lt;<a class="reference external" href="mailto:pimolnats&#64;ecosoft.co.th">pimolnats&#64;ecosoft.co.th</a>&gt;</li>
+<li>Alan Ramos &lt;<a class="reference external" href="mailto:alan.ramos&#64;jarsa.com.mx">alan.ramos&#64;jarsa.com.mx</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -425,7 +426,7 @@ <h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external" href="https://github.com/sergio-teruel"><img alt="sergio-teruel" src="https://github.com/sergio-teruel.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/product-attribute/tree/13.0/product_secondary_unit">OCA/product-attribute</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/product-attribute/tree/14.0/product_secondary_unit">OCA/product-attribute</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/product_secondary_unit/views/product_views.xml b/product_secondary_unit/views/product_views.xml
index 636afb0a564..3ba249c6a82 100644
--- a/product_secondary_unit/views/product_views.xml
+++ b/product_secondary_unit/views/product_views.xml
@@ -9,7 +9,7 @@
         <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
         <field name="arch" type="xml">
             <xpath expr="//page[@name='general_information']" position="inside">
-                <group string="secondary unit of measure">
+                <group string="Secondary Unit of Measure">
                     <field name="secondary_uom_ids" nolabel="1">
                         <tree string="secondary Unit" editable="top">
                             <field name="code" />

From 00d1901854b81ade7803ea3dfd6e407990d8acb0 Mon Sep 17 00:00:00 2001
From: sergio-teruel <sergio.teruel@tecnativa.com>
Date: Mon, 11 Jan 2021 22:16:59 +0100
Subject: [PATCH 14/58] [IMP] product_secondary_unit: Add mixin model to be
 inherited from other models. TT27363

---
 product_secondary_unit/models/__init__.py     |   1 +
 .../models/product_secondary_unit_mixin.py    |  98 +++++++++++++++++
 product_secondary_unit/tests/__init__.py      |   1 +
 product_secondary_unit/tests/models.py        |  28 +++++
 .../tests/test_secondary_unit_mixin.py        | 102 ++++++++++++++++++
 5 files changed, 230 insertions(+)
 create mode 100644 product_secondary_unit/models/product_secondary_unit_mixin.py
 create mode 100644 product_secondary_unit/tests/models.py
 create mode 100644 product_secondary_unit/tests/test_secondary_unit_mixin.py

diff --git a/product_secondary_unit/models/__init__.py b/product_secondary_unit/models/__init__.py
index 4775c1b3fcc..9af876b23b2 100644
--- a/product_secondary_unit/models/__init__.py
+++ b/product_secondary_unit/models/__init__.py
@@ -1,3 +1,4 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from . import product_second_unit
+from . import product_secondary_unit_mixin
 from . import product_template
diff --git a/product_secondary_unit/models/product_secondary_unit_mixin.py b/product_secondary_unit/models/product_secondary_unit_mixin.py
new file mode 100644
index 00000000000..3c2434cddc2
--- /dev/null
+++ b/product_secondary_unit/models/product_secondary_unit_mixin.py
@@ -0,0 +1,98 @@
+# Copyright 2021 Tecnativa - Sergio Teruel
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo import api, fields, models
+from odoo.tools.float_utils import float_round
+
+
+class ProductSecondaryUnitMixin(models.AbstractModel):
+    """
+    Mixin model that allows to compute a field from a secondary unit helper
+    An example is to extend any model in which you want to compute quantities
+    based on secondary units. You must add a dictionary `_secondary_unit_fields`
+    as class variable with the following content:
+    _secondary_unit_fields = {
+        "qty_field": "product_uom_qty",
+        "uom_field": "product_uom"
+    }
+
+    To compute ``qty_field`` on target model, you must convert the field to computed
+    writable (computed, stored and readonly=False), and you have to define the
+    compute method adding ``secondary_uom_id`` and ``secondary_uom_qty`` fields
+    as dependencies and calling inside to ``self._compute_helper_target_field_qty()``.
+
+    To compute secondary units when user changes the uom field on target model,
+    you must add an onchange method on uom field and call to
+    ``self._onchange_helper_product_uom_for_secondary()``
+
+    You can see an example in ``purchase_order_secondary_unit`` on purchase-workflow
+    repository.
+    """
+
+    _name = "product.secondary.unit.mixin"
+    _description = "Product Secondary Unit Mixin"
+    _secondary_unit_fields = {}
+
+    secondary_uom_qty = fields.Float(
+        string="Secondary Qty",
+        digits="Product Unit of Measure",
+        store=True,
+        readonly=False,
+        compute="_compute_secondary_uom_qty",
+    )
+    secondary_uom_id = fields.Many2one(
+        comodel_name="product.secondary.unit", string="Second unit"
+    )
+
+    def _get_uom_line(self):
+        return self[self._secondary_unit_fields["uom_field"]]
+
+    def _get_factor_line(self):
+        return self.secondary_uom_id.factor * self._get_uom_line().factor
+
+    def _get_quantity_from_line(self):
+        return self[self._secondary_unit_fields["qty_field"]]
+
+    @api.model
+    def _get_secondary_uom_qty_depends(self):
+        if not self._secondary_unit_fields:
+            return []
+        return [self._secondary_unit_fields["qty_field"]]
+
+    @api.depends(lambda x: x._get_secondary_uom_qty_depends())
+    def _compute_secondary_uom_qty(self):
+        for line in self:
+            if not line.secondary_uom_id:
+                continue
+            factor = line._get_factor_line()
+            qty_line = line._get_quantity_from_line()
+            qty = float_round(
+                qty_line / (factor or 1.0),
+                precision_rounding=line.secondary_uom_id.uom_id.rounding,
+            )
+            line.secondary_uom_qty = qty
+
+    def _compute_helper_target_field_qty(self):
+        """Set the target qty field defined in model"""
+        for rec in self:
+            if not rec.secondary_uom_id:
+                continue
+            factor = rec._get_factor_line()
+            qty = float_round(
+                rec.secondary_uom_qty * factor,
+                precision_rounding=rec._get_uom_line().rounding,
+            )
+            rec[rec._secondary_unit_fields["qty_field"]] = qty
+
+    def _onchange_helper_product_uom_for_secondary(self):
+        """Helper method to be called from onchange method of uom field in
+        target model.
+        """
+        if not self.secondary_uom_id:
+            return
+        factor = self._get_factor_line()
+        line_qty = self._get_quantity_from_line()
+        qty = float_round(
+            line_qty / (factor or 1.0),
+            precision_rounding=self._get_uom_line().rounding,
+        )
+        self.secondary_uom_qty = qty
diff --git a/product_secondary_unit/tests/__init__.py b/product_secondary_unit/tests/__init__.py
index 62bc6773d19..c10322abd6a 100644
--- a/product_secondary_unit/tests/__init__.py
+++ b/product_secondary_unit/tests/__init__.py
@@ -1,2 +1,3 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from . import test_product_second_unit
+from . import test_secondary_unit_mixin
diff --git a/product_secondary_unit/tests/models.py b/product_secondary_unit/tests/models.py
new file mode 100644
index 00000000000..c801b407394
--- /dev/null
+++ b/product_secondary_unit/tests/models.py
@@ -0,0 +1,28 @@
+# Copyright 2021 Tecnativa - Sergio Teruel
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo import api, fields, models
+
+
+class SecondaryUnitFake(models.Model):
+    _name = "secondary.unit.fake"
+    _inherit = "product.secondary.unit.mixin"
+    _description = "Secondary unit fake model for tests"
+    _secondary_unit_fields = {
+        "qty_field": "product_uom_qty",
+        "uom_field": "product_uom_id",
+    }
+
+    name = fields.Char()
+    product_id = fields.Many2one("product.product", "Product", readonly=True)
+    product_uom_qty = fields.Float(
+        store=True, readonly=False, compute="_compute_product_uom_qty"
+    )
+    product_uom_id = fields.Many2one("uom.uom", string="Product Unit of Measure")
+
+    @api.depends("secondary_uom_qty", "secondary_uom_id")
+    def _compute_product_uom_qty(self):
+        self._compute_helper_target_field_qty()
+
+    @api.onchange("product_uom_id")
+    def _onchange_product_uom(self):
+        self._onchange_helper_product_uom_for_secondary()
diff --git a/product_secondary_unit/tests/test_secondary_unit_mixin.py b/product_secondary_unit/tests/test_secondary_unit_mixin.py
new file mode 100644
index 00000000000..c5277da98d0
--- /dev/null
+++ b/product_secondary_unit/tests/test_secondary_unit_mixin.py
@@ -0,0 +1,102 @@
+# Copyright 2021 Tecnativa - Sergio Teruel
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo_test_helper import FakeModelLoader
+
+from odoo.tests import SavepointCase
+
+
+class TestProductSecondaryUnitMixin(SavepointCase, FakeModelLoader):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.loader = FakeModelLoader(cls.env, cls.__module__)
+        cls.loader.backup_registry()
+        from .models import SecondaryUnitFake
+
+        cls.loader.update_registry((SecondaryUnitFake,))
+        cls.product_uom_kg = cls.env.ref("uom.product_uom_kgm")
+        cls.product_uom_unit = cls.env.ref("uom.product_uom_unit")
+        cls.product_uom_dozen = cls.env.ref("uom.product_uom_dozen")
+        cls.product_template = cls.env["product.template"].create(
+            {
+                "name": "test",
+                "uom_id": cls.product_uom_kg.id,
+                "uom_po_id": cls.product_uom_kg.id,
+                "secondary_uom_ids": [
+                    (
+                        0,
+                        0,
+                        {
+                            "code": "C5",
+                            "name": "box 5",
+                            "uom_id": cls.product_uom_unit.id,
+                            "factor": 5,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "code": "C10",
+                            "name": "box 10",
+                            "uom_id": cls.product_uom_unit.id,
+                            "factor": 10,
+                        },
+                    ),
+                ],
+            }
+        )
+        cls.secondary_unit_box_5 = cls.product_template.secondary_uom_ids[0]
+        cls.secondary_unit_box_10 = cls.product_template.secondary_uom_ids[1]
+        # Fake model which inherit from
+        cls.secondary_unit_fake = cls.env["secondary.unit.fake"].create(
+            {
+                "name": "Secondary unit fake",
+                "product_id": cls.product_template.product_variant_ids.id,
+                "product_uom_id": cls.product_uom_unit.id,
+            }
+        )
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.loader.restore_registry()
+        super(TestProductSecondaryUnitMixin, cls).tearDownClass()
+
+    def test_product_secondary_unit_mixin(self):
+        fake_model = self.secondary_unit_fake
+
+        fake_model.write(
+            {"secondary_uom_qty": 2, "secondary_uom_id": self.secondary_unit_box_5.id}
+        )
+        self.assertEqual(fake_model.product_uom_qty, 10.0)
+
+        fake_model.write(
+            {"secondary_uom_qty": 2, "secondary_uom_id": self.secondary_unit_box_10.id}
+        )
+        self.assertEqual(fake_model.product_uom_qty, 20.0)
+
+        fake_model.write({"product_uom_qty": 40.0})
+        self.assertEqual(fake_model.secondary_uom_qty, 4)
+
+        # Test onchange helper method
+        fake_model.write(
+            {"secondary_uom_qty": 1, "secondary_uom_id": self.secondary_unit_box_10.id}
+        )
+        fake_model.flush()
+        fake_model.product_uom_id = self.product_uom_dozen
+        fake_model._onchange_helper_product_uom_for_secondary()
+        self.assertEqual(fake_model.secondary_uom_qty, 12)
+
+    def test_product_secondary_unit_mixin_no_uom(self):
+        # If secondary_uom_id is not informed product_qty on target model is
+        # not computed.
+        fake_model = self.secondary_unit_fake
+        fake_model.secondary_uom_qty = 23
+        self.assertEqual(fake_model.product_uom_qty, 0)
+
+    def test_product_secondary_unit_mixin_no_uom_onchange(self):
+        # If secondary_uom_id is not informed secondary_uom_qty on source
+        # model is not computed.
+        fake_model = self.secondary_unit_fake
+        fake_model._onchange_helper_product_uom_for_secondary()
+        self.assertEqual(fake_model.secondary_uom_qty, 0)

From 1aa5584a4a7d0cb4a6352890655673c8b6c94c00 Mon Sep 17 00:00:00 2001
From: sergio-teruel <sergio.teruel@tecnativa.com>
Date: Sat, 16 Jan 2021 22:29:29 +0100
Subject: [PATCH 15/58] [FIX] product_secondary_unit: Avoid to recompute
 secondary_uom_qty when secondary uom changes

[FIX] product_secondary_unit: Avoid cache missed
---
 .../models/product_secondary_unit_mixin.py           |  8 ++++++++
 .../tests/test_secondary_unit_mixin.py               | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/product_secondary_unit/models/product_secondary_unit_mixin.py b/product_secondary_unit/models/product_secondary_unit_mixin.py
index 3c2434cddc2..4757ed8d519 100644
--- a/product_secondary_unit/models/product_secondary_unit_mixin.py
+++ b/product_secondary_unit/models/product_secondary_unit_mixin.py
@@ -75,7 +75,15 @@ def _compute_helper_target_field_qty(self):
         """Set the target qty field defined in model"""
         for rec in self:
             if not rec.secondary_uom_id:
+                rec[rec._secondary_unit_fields["qty_field"]] = rec._origin[
+                    rec._secondary_unit_fields["qty_field"]
+                ]
                 continue
+            # To avoid recompute secondary_uom_qty field when
+            # secondary_uom_id changes.
+            rec.env.remove_to_compute(
+                field=rec._fields["secondary_uom_qty"], records=rec
+            )
             factor = rec._get_factor_line()
             qty = float_round(
                 rec.secondary_uom_qty * factor,
diff --git a/product_secondary_unit/tests/test_secondary_unit_mixin.py b/product_secondary_unit/tests/test_secondary_unit_mixin.py
index c5277da98d0..377d02c55b6 100644
--- a/product_secondary_unit/tests/test_secondary_unit_mixin.py
+++ b/product_secondary_unit/tests/test_secondary_unit_mixin.py
@@ -100,3 +100,15 @@ def test_product_secondary_unit_mixin_no_uom_onchange(self):
         fake_model = self.secondary_unit_fake
         fake_model._onchange_helper_product_uom_for_secondary()
         self.assertEqual(fake_model.secondary_uom_qty, 0)
+
+    def test_chained_compute_field(self):
+        """Secondary_uom_qty has not been computed when secondary_uom_id changes
+        """
+        fake_model = self.secondary_unit_fake
+        fake_model.secondary_uom_qty = 2.0
+        fake_model.secondary_uom_id = self.secondary_unit_box_5
+        self.assertEqual(fake_model.product_uom_qty, 10.0)
+        self.assertEqual(fake_model.secondary_uom_qty, 2.0)
+        fake_model.secondary_uom_id = self.secondary_unit_box_10
+        self.assertEqual(fake_model.product_uom_qty, 20.0)
+        self.assertEqual(fake_model.secondary_uom_qty, 2.0)

From 01fe751814adb4183a522f534c2261bf33112c49 Mon Sep 17 00:00:00 2001
From: Mourad <mourad.elhadj.mimoune@akretion.com>
Date: Wed, 14 Apr 2021 10:53:36 +0200
Subject: [PATCH 16/58] [IMP] add dependency type for
 product_secondary_unit_mixin

---
 .../models/product_second_unit.py                 | 11 +++++++++++
 .../models/product_secondary_unit_mixin.py        | 15 ++++++++++++---
 .../tests/test_secondary_unit_mixin.py            |  3 +--
 product_secondary_unit/views/product_views.xml    |  1 +
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/product_secondary_unit/models/product_second_unit.py b/product_secondary_unit/models/product_second_unit.py
index 967e41e501c..354bd05856f 100644
--- a/product_secondary_unit/models/product_second_unit.py
+++ b/product_secondary_unit/models/product_second_unit.py
@@ -21,6 +21,17 @@ class ProductSecondaryUnit(models.Model):
         required=True,
         help="Default Secondary Unit of Measure.",
     )
+    dependency_type = fields.Selection(
+        selection=[
+            ("dependent", "Dependent"),
+            ("independent", "Independent"),
+        ],
+        default="dependent",
+        help="If dependency type is 'dependent' the factor is used for compute quantity in primary unit,"
+        "otherwise primery and secondary unit are independent. For exemple if you sell service"
+        "by packege (1 unit for example) and you want to put the real time (ex : 4 hours)"
+        "to allows employee schedelling",
+    )
     factor = fields.Float(
         string="Secondary Unit Factor", default=1.0, digits=0, required=True
     )
diff --git a/product_secondary_unit/models/product_secondary_unit_mixin.py b/product_secondary_unit/models/product_secondary_unit_mixin.py
index 4757ed8d519..e4eea267a98 100644
--- a/product_secondary_unit/models/product_secondary_unit_mixin.py
+++ b/product_secondary_unit/models/product_secondary_unit_mixin.py
@@ -61,7 +61,10 @@ def _get_secondary_uom_qty_depends(self):
     @api.depends(lambda x: x._get_secondary_uom_qty_depends())
     def _compute_secondary_uom_qty(self):
         for line in self:
-            if not line.secondary_uom_id:
+            if (
+                not line.secondary_uom_id
+                or line.secondary_uom_id.dependency_type == "independent"
+            ):
                 continue
             factor = line._get_factor_line()
             qty_line = line._get_quantity_from_line()
@@ -74,7 +77,10 @@ def _compute_secondary_uom_qty(self):
     def _compute_helper_target_field_qty(self):
         """Set the target qty field defined in model"""
         for rec in self:
-            if not rec.secondary_uom_id:
+            if (
+                not rec.secondary_uom_id
+                or rec.secondary_uom_id.dependency_type == "independent"
+            ):
                 rec[rec._secondary_unit_fields["qty_field"]] = rec._origin[
                     rec._secondary_unit_fields["qty_field"]
                 ]
@@ -95,7 +101,10 @@ def _onchange_helper_product_uom_for_secondary(self):
         """Helper method to be called from onchange method of uom field in
         target model.
         """
-        if not self.secondary_uom_id:
+        if (
+            not self.secondary_uom_id
+            or self.secondary_uom_id.dependency_type == "independent"
+        ):
             return
         factor = self._get_factor_line()
         line_qty = self._get_quantity_from_line()
diff --git a/product_secondary_unit/tests/test_secondary_unit_mixin.py b/product_secondary_unit/tests/test_secondary_unit_mixin.py
index 377d02c55b6..5df5387ada6 100644
--- a/product_secondary_unit/tests/test_secondary_unit_mixin.py
+++ b/product_secondary_unit/tests/test_secondary_unit_mixin.py
@@ -102,8 +102,7 @@ def test_product_secondary_unit_mixin_no_uom_onchange(self):
         self.assertEqual(fake_model.secondary_uom_qty, 0)
 
     def test_chained_compute_field(self):
-        """Secondary_uom_qty has not been computed when secondary_uom_id changes
-        """
+        """Secondary_uom_qty has not been computed when secondary_uom_id changes"""
         fake_model = self.secondary_unit_fake
         fake_model.secondary_uom_qty = 2.0
         fake_model.secondary_uom_id = self.secondary_unit_box_5
diff --git a/product_secondary_unit/views/product_views.xml b/product_secondary_unit/views/product_views.xml
index 3ba249c6a82..be13b315ad2 100644
--- a/product_secondary_unit/views/product_views.xml
+++ b/product_secondary_unit/views/product_views.xml
@@ -16,6 +16,7 @@
                             <field name="name" />
                             <field name="uom_id" />
                             <field name="factor" />
+                            <field name="dependency_type" />
                         </tree>
                     </field>
                 </group>

From 72de1b7348350b1b29aaa39c8d88c4d4c797796f Mon Sep 17 00:00:00 2001
From: mourad-ehm <mourad.elhadj.mimoune@akretion.com>
Date: Tue, 8 Jun 2021 11:58:49 +0200
Subject: [PATCH 17/58] Apply suggestions from code review

Co-authored-by: Hpar <raphael.reverdy@akretion.com>
---
 product_secondary_unit/models/product_second_unit.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/product_secondary_unit/models/product_second_unit.py b/product_secondary_unit/models/product_second_unit.py
index 354bd05856f..fdd4547dfbc 100644
--- a/product_secondary_unit/models/product_second_unit.py
+++ b/product_secondary_unit/models/product_second_unit.py
@@ -27,10 +27,10 @@ class ProductSecondaryUnit(models.Model):
             ("independent", "Independent"),
         ],
         default="dependent",
-        help="If dependency type is 'dependent' the factor is used for compute quantity in primary unit,"
-        "otherwise primery and secondary unit are independent. For exemple if you sell service"
-        "by packege (1 unit for example) and you want to put the real time (ex : 4 hours)"
-        "to allows employee schedelling",
+        help="If dependency type is 'dependent' the factor is used to compute quantity in primary unit,"
+        "otherwise primary and secondary unit are independent. For example if you sell service"
+        "by package (1 unit for example) and you want to put the real time (ex : 4 hours)"
+        "to allows employee scheduling",
     )
     factor = fields.Float(
         string="Secondary Unit Factor", default=1.0, digits=0, required=True

From f3cf3bb938d6f584ec7f4d1b1262cd95c71a20dc Mon Sep 17 00:00:00 2001
From: Mourad <mourad.elhadj.mimoune@akretion.com>
Date: Fri, 25 Jun 2021 15:13:37 +0200
Subject: [PATCH 18/58] [FIX] refactor code

---
 .../models/product_secondary_unit_mixin.py    | 25 ++++++++-----------
 .../models/product_template.py                | 10 +++++++-
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/product_secondary_unit/models/product_secondary_unit_mixin.py b/product_secondary_unit/models/product_secondary_unit_mixin.py
index e4eea267a98..7f500e80717 100644
--- a/product_secondary_unit/models/product_secondary_unit_mixin.py
+++ b/product_secondary_unit/models/product_secondary_unit_mixin.py
@@ -1,7 +1,7 @@
 # Copyright 2021 Tecnativa - Sergio Teruel
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from odoo import api, fields, models
-from odoo.tools.float_utils import float_round
+from odoo.tools.float_utils import float_compare, float_round
 
 
 class ProductSecondaryUnitMixin(models.AbstractModel):
@@ -32,15 +32,23 @@ class ProductSecondaryUnitMixin(models.AbstractModel):
     _description = "Product Secondary Unit Mixin"
     _secondary_unit_fields = {}
 
+    @api.model
+    def _get_default_secondary_uom(self):
+        return self.env["product.template"]._get_default_secondary_uom()
+
     secondary_uom_qty = fields.Float(
         string="Secondary Qty",
         digits="Product Unit of Measure",
         store=True,
         readonly=False,
         compute="_compute_secondary_uom_qty",
+        default="1",
     )
     secondary_uom_id = fields.Many2one(
-        comodel_name="product.secondary.unit", string="Second unit"
+        comodel_name="product.secondary.unit",
+        string="Second unit",
+        ondelete="restrict",
+        default=_get_default_secondary_uom,
     )
 
     def _get_uom_line(self):
@@ -101,15 +109,4 @@ def _onchange_helper_product_uom_for_secondary(self):
         """Helper method to be called from onchange method of uom field in
         target model.
         """
-        if (
-            not self.secondary_uom_id
-            or self.secondary_uom_id.dependency_type == "independent"
-        ):
-            return
-        factor = self._get_factor_line()
-        line_qty = self._get_quantity_from_line()
-        qty = float_round(
-            line_qty / (factor or 1.0),
-            precision_rounding=self._get_uom_line().rounding,
-        )
-        self.secondary_uom_qty = qty
+        self._compute_helper_target_field_qty()
diff --git a/product_secondary_unit/models/product_template.py b/product_secondary_unit/models/product_template.py
index 9fb36430fc7..fba1099909d 100644
--- a/product_secondary_unit/models/product_template.py
+++ b/product_secondary_unit/models/product_template.py
@@ -1,6 +1,6 @@
 # Copyright 2018 Tecnativa - Sergio Teruel
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-from odoo import fields, models
+from odoo import api, fields, models
 
 
 class ProductTemplate(models.Model):
@@ -12,3 +12,11 @@ class ProductTemplate(models.Model):
         string="Secondary Unit of Measure",
         help="Default Secondary Unit of Measure.",
     )
+
+    @api.model
+    def _get_default_secondary_uom(self):
+        return (
+            self.secondary_uom_ids
+            and self.secondary_uom_ids[0]
+            or self.secondary_uom_ids
+        )

From 9ef283cc05476d03dc027237c6ee39a473b9268e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Roche?= <kevin.roche@akretion.com>
Date: Mon, 19 Jul 2021 09:51:27 +0200
Subject: [PATCH 19/58] [FIX] formatting and minor changes

---
 .../models/product_second_unit.py             | 10 ++++---
 .../models/product_secondary_unit_mixin.py    | 29 ++++++++++---------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/product_secondary_unit/models/product_second_unit.py b/product_secondary_unit/models/product_second_unit.py
index fdd4547dfbc..ccbf03f9063 100644
--- a/product_secondary_unit/models/product_second_unit.py
+++ b/product_secondary_unit/models/product_second_unit.py
@@ -27,10 +27,12 @@ class ProductSecondaryUnit(models.Model):
             ("independent", "Independent"),
         ],
         default="dependent",
-        help="If dependency type is 'dependent' the factor is used to compute quantity in primary unit,"
-        "otherwise primary and secondary unit are independent. For example if you sell service"
-        "by package (1 unit for example) and you want to put the real time (ex : 4 hours)"
-        "to allows employee scheduling",
+        help="If dependency type is 'dependent' the factor is used "
+        "to compute quantity in primary unit,"
+        "otherwise primary and secondary unit are independent. "
+        "For example if you sell service"
+        "by package (1 unit for example) and you want to put the "
+        "real time (ex : 4 hours) to allows employee scheduling",
     )
     factor = fields.Float(
         string="Secondary Unit Factor", default=1.0, digits=0, required=True
diff --git a/product_secondary_unit/models/product_secondary_unit_mixin.py b/product_secondary_unit/models/product_secondary_unit_mixin.py
index 7f500e80717..33b964af7a3 100644
--- a/product_secondary_unit/models/product_secondary_unit_mixin.py
+++ b/product_secondary_unit/models/product_secondary_unit_mixin.py
@@ -1,7 +1,7 @@
 # Copyright 2021 Tecnativa - Sergio Teruel
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from odoo import api, fields, models
-from odoo.tools.float_utils import float_compare, float_round
+from odoo.tools.float_utils import float_round
 
 
 class ProductSecondaryUnitMixin(models.AbstractModel):
@@ -69,18 +69,7 @@ def _get_secondary_uom_qty_depends(self):
     @api.depends(lambda x: x._get_secondary_uom_qty_depends())
     def _compute_secondary_uom_qty(self):
         for line in self:
-            if (
-                not line.secondary_uom_id
-                or line.secondary_uom_id.dependency_type == "independent"
-            ):
-                continue
-            factor = line._get_factor_line()
-            qty_line = line._get_quantity_from_line()
-            qty = float_round(
-                qty_line / (factor or 1.0),
-                precision_rounding=line.secondary_uom_id.uom_id.rounding,
-            )
-            line.secondary_uom_qty = qty
+            line._onchange_helper_product_uom_for_secondary()
 
     def _compute_helper_target_field_qty(self):
         """Set the target qty field defined in model"""
@@ -109,4 +98,16 @@ def _onchange_helper_product_uom_for_secondary(self):
         """Helper method to be called from onchange method of uom field in
         target model.
         """
-        self._compute_helper_target_field_qty()
+        if (
+            not self.secondary_uom_id
+            or self.secondary_uom_id.dependency_type == "independent"
+        ):
+            self.secondary_uom_qty = 0.0
+            return
+        factor = self._get_factor_line()
+        line_qty = self._get_quantity_from_line()
+        qty = float_round(
+            line_qty / (factor or 1.0),
+            precision_rounding=self._get_uom_line().rounding,
+        )
+        self.secondary_uom_qty = qty

From 04da560a53da52b12cce3452f13825386d4e79e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Roche?= <kevin.roche@akretion.com>
Date: Thu, 22 Jul 2021 21:40:31 +0200
Subject: [PATCH 20/58] rework and test dependency_type

---
 product_secondary_unit/__manifest__.py        |  2 +-
 product_secondary_unit/i18n/es.po             | 53 ++++++++++++++++--
 product_secondary_unit/i18n/es_MX.po          | 52 ++++++++++++++++--
 product_secondary_unit/i18n/fr.po             | 52 ++++++++++++++++--
 .../i18n/product_secondary_unit.pot           | 42 +++++++++++++++
 product_secondary_unit/i18n/zh_CN.po          | 54 +++++++++++++++++--
 .../models/product_secondary_unit_mixin.py    | 20 +++++--
 .../tests/test_secondary_unit_mixin.py        | 14 +++++
 8 files changed, 265 insertions(+), 24 deletions(-)

diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index 38afd8f57aa..5ec29145b27 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Product Secondary Unit",
     "summary": "Set a secondary unit per product",
-    "version": "14.0.1.0.0",
+    "version": "14.0.1.0.1",
     "development_status": "Production/Stable",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
diff --git a/product_secondary_unit/i18n/es.po b/product_secondary_unit/i18n/es.po
index 5ed405865dd..581ccd6c6ac 100644
--- a/product_secondary_unit/i18n/es.po
+++ b/product_secondary_unit/i18n/es.po
@@ -39,18 +39,48 @@ msgstr "Creado en"
 msgid "Default Secondary Unit of Measure."
 msgstr "Segunda unidad de medida por defecto."
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid "Dependency Type"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__dependent
+msgid "Dependent"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__display_name
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__display_name
 msgid "Display Name"
 msgstr "Mostrar nombre"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__id
 msgid "ID"
 msgstr "ID (Identificador)"
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid ""
+"If dependency type is 'dependent' the factor is used to compute quantity in "
+"primary unit,otherwise primary and secondary unit are independent. For "
+"example if you sell serviceby package (1 unit for example) and you want to "
+"put the real time (ex : 4 hours) to allows employee scheduling"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__independent
+msgid "Independent"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin____last_update
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
@@ -72,16 +102,30 @@ msgstr "Nombre"
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
 #, fuzzy
-#| msgid "product.secondary.unit"
 msgid "Product Secondary Unit"
 msgstr "'product.secondary.unit'"
 
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit_mixin
+msgid "Product Secondary Unit Mixin"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_template
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
 msgid "Product Template"
 msgstr "Plantilla de producto"
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_id
+msgid "Second unit"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_qty
+msgid "Secondary Qty"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__factor
 msgid "Secondary Unit Factor"
@@ -91,6 +135,7 @@ msgstr "Factor segunda unidad"
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_product__secondary_uom_ids
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__uom_id
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
 msgid "Secondary Unit of Measure"
 msgstr "Segunda unidad de medida"
 
@@ -99,10 +144,8 @@ msgstr "Segunda unidad de medida"
 msgid "secondary Unit"
 msgstr "Unidad Secundaria"
 
-#. module: product_secondary_unit
-#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
-msgid "secondary unit of measure"
-msgstr "Segunda unidad de medida"
+#~ msgid "secondary unit of measure"
+#~ msgstr "Segunda unidad de medida"
 
 #~ msgid "Default unit sale"
 #~ msgstr "Unidad de venta por defecto"
diff --git a/product_secondary_unit/i18n/es_MX.po b/product_secondary_unit/i18n/es_MX.po
index 1c53972a262..5040e4be51c 100644
--- a/product_secondary_unit/i18n/es_MX.po
+++ b/product_secondary_unit/i18n/es_MX.po
@@ -38,18 +38,48 @@ msgstr "Creado en"
 msgid "Default Secondary Unit of Measure."
 msgstr "Unidad de Medida Secundaria por Defecto."
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid "Dependency Type"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__dependent
+msgid "Dependent"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__display_name
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__display_name
 msgid "Display Name"
 msgstr "Nombre para Mostrar"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid ""
+"If dependency type is 'dependent' the factor is used to compute quantity in "
+"primary unit,otherwise primary and secondary unit are independent. For "
+"example if you sell serviceby package (1 unit for example) and you want to "
+"put the real time (ex : 4 hours) to allows employee scheduling"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__independent
+msgid "Independent"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin____last_update
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Última Actualización en"
 
@@ -73,12 +103,27 @@ msgstr "Nombre"
 msgid "Product Secondary Unit"
 msgstr "Unidad de Medida Secundaria del Producto"
 
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit_mixin
+msgid "Product Secondary Unit Mixin"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_template
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
 msgid "Product Template"
 msgstr "Plantilla de Producto"
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_id
+msgid "Second unit"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_qty
+msgid "Secondary Qty"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__factor
 msgid "Secondary Unit Factor"
@@ -88,6 +133,7 @@ msgstr "Factor de Unidad Secundaria"
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_product__secondary_uom_ids
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__uom_id
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
 msgid "Secondary Unit of Measure"
 msgstr "Unidad de Medida Secundaria"
 
@@ -96,7 +142,5 @@ msgstr "Unidad de Medida Secundaria"
 msgid "secondary Unit"
 msgstr "Unidad Secundaria"
 
-#. module: product_secondary_unit
-#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
-msgid "secondary unit of measure"
-msgstr "unidad de medida secundaria"
+#~ msgid "secondary unit of measure"
+#~ msgstr "unidad de medida secundaria"
diff --git a/product_secondary_unit/i18n/fr.po b/product_secondary_unit/i18n/fr.po
index 1ff795c74b4..f3acde2c776 100644
--- a/product_secondary_unit/i18n/fr.po
+++ b/product_secondary_unit/i18n/fr.po
@@ -38,18 +38,48 @@ msgstr "Créé le"
 msgid "Default Secondary Unit of Measure."
 msgstr "Unité de mesure secondaire par défaut."
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid "Dependency Type"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__dependent
+msgid "Dependent"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__display_name
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__display_name
 msgid "Display Name"
 msgstr "Nom affiché"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid ""
+"If dependency type is 'dependent' the factor is used to compute quantity in "
+"primary unit,otherwise primary and secondary unit are independent. For "
+"example if you sell serviceby package (1 unit for example) and you want to "
+"put the real time (ex : 4 hours) to allows employee scheduling"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__independent
+msgid "Independent"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin____last_update
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Dernière Modification le"
 
@@ -73,12 +103,27 @@ msgstr "Nom"
 msgid "Product Secondary Unit"
 msgstr "Unité produit secondaire"
 
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit_mixin
+msgid "Product Secondary Unit Mixin"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_template
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
 msgid "Product Template"
 msgstr "Modèle de produit"
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_id
+msgid "Second unit"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_qty
+msgid "Secondary Qty"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__factor
 msgid "Secondary Unit Factor"
@@ -88,6 +133,7 @@ msgstr "Facteur de l'unité secondaire"
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_product__secondary_uom_ids
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__uom_id
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
 msgid "Secondary Unit of Measure"
 msgstr "Unité de mesure secondaire"
 
@@ -96,10 +142,8 @@ msgstr "Unité de mesure secondaire"
 msgid "secondary Unit"
 msgstr "Unité secondaire"
 
-#. module: product_secondary_unit
-#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
-msgid "secondary unit of measure"
-msgstr "Unité de mesure secondaire"
+#~ msgid "secondary unit of measure"
+#~ msgstr "Unité de mesure secondaire"
 
 #~ msgid "Default unit sale"
 #~ msgstr "Unité de vente par défaut"
diff --git a/product_secondary_unit/i18n/product_secondary_unit.pot b/product_secondary_unit/i18n/product_secondary_unit.pot
index f2c019e4026..d819f6b1233 100644
--- a/product_secondary_unit/i18n/product_secondary_unit.pot
+++ b/product_secondary_unit/i18n/product_secondary_unit.pot
@@ -35,20 +35,47 @@ msgstr ""
 msgid "Default Secondary Unit of Measure."
 msgstr ""
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid "Dependency Type"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__dependent
+msgid "Dependent"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__display_name
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__id
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__id
 msgid "ID"
 msgstr ""
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid ""
+"If dependency type is 'dependent' the factor is used to compute quantity in "
+"primary unit,otherwise primary and secondary unit are independent. For "
+"example if you sell serviceby package (1 unit for example) and you want to "
+"put the real time (ex : 4 hours) to allows employee scheduling"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__independent
+msgid "Independent"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin____last_update
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_template____last_update
 msgid "Last Modified on"
 msgstr ""
@@ -73,12 +100,27 @@ msgstr ""
 msgid "Product Secondary Unit"
 msgstr ""
 
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit_mixin
+msgid "Product Secondary Unit Mixin"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_template
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
 msgid "Product Template"
 msgstr ""
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_id
+msgid "Second unit"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_qty
+msgid "Secondary Qty"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__factor
 msgid "Secondary Unit Factor"
diff --git a/product_secondary_unit/i18n/zh_CN.po b/product_secondary_unit/i18n/zh_CN.po
index 4bde169095b..d1df9d069e3 100644
--- a/product_secondary_unit/i18n/zh_CN.po
+++ b/product_secondary_unit/i18n/zh_CN.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* product_secondary_unit
+# 	* product_secondary_unit
 #
 msgid ""
 msgstr ""
@@ -38,18 +38,48 @@ msgstr "创建于"
 msgid "Default Secondary Unit of Measure."
 msgstr "默认辅助计量单位。"
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid "Dependency Type"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__dependent
+msgid "Dependent"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__display_name
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__display_name
 msgid "Display Name"
 msgstr "显示名称"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid ""
+"If dependency type is 'dependent' the factor is used to compute quantity in "
+"primary unit,otherwise primary and secondary unit are independent. For "
+"example if you sell serviceby package (1 unit for example) and you want to "
+"put the real time (ex : 4 hours) to allows employee scheduling"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__independent
+msgid "Independent"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin____last_update
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "最后修改于"
 
@@ -73,12 +103,27 @@ msgstr "名称"
 msgid "Product Secondary Unit"
 msgstr "产品辅助计量单位"
 
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit_mixin
+msgid "Product Secondary Unit Mixin"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_template
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
 msgid "Product Template"
 msgstr "产品模版"
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_id
+msgid "Second unit"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_qty
+msgid "Secondary Qty"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__factor
 msgid "Secondary Unit Factor"
@@ -88,6 +133,7 @@ msgstr "转换率"
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_product__secondary_uom_ids
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__uom_id
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
 msgid "Secondary Unit of Measure"
 msgstr "辅助计量单位"
 
@@ -96,7 +142,5 @@ msgstr "辅助计量单位"
 msgid "secondary Unit"
 msgstr "辅助计量单位"
 
-#. module: product_secondary_unit
-#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
-msgid "secondary unit of measure"
-msgstr "辅助计量单位"
+#~ msgid "secondary unit of measure"
+#~ msgstr "辅助计量单位"
diff --git a/product_secondary_unit/models/product_secondary_unit_mixin.py b/product_secondary_unit/models/product_secondary_unit_mixin.py
index 33b964af7a3..462f95706de 100644
--- a/product_secondary_unit/models/product_secondary_unit_mixin.py
+++ b/product_secondary_unit/models/product_secondary_unit_mixin.py
@@ -69,7 +69,18 @@ def _get_secondary_uom_qty_depends(self):
     @api.depends(lambda x: x._get_secondary_uom_qty_depends())
     def _compute_secondary_uom_qty(self):
         for line in self:
-            line._onchange_helper_product_uom_for_secondary()
+            if not line.secondary_uom_id:
+                line.secondary_uom_qty = 0.0
+                continue
+            elif line.secondary_uom_id.dependency_type == "independent":
+                continue
+            factor = line._get_factor_line()
+            qty_line = line._get_quantity_from_line()
+            qty = float_round(
+                qty_line / (factor or 1.0),
+                precision_rounding=line.secondary_uom_id.uom_id.rounding,
+            )
+            line.secondary_uom_qty = qty
 
     def _compute_helper_target_field_qty(self):
         """Set the target qty field defined in model"""
@@ -98,12 +109,11 @@ def _onchange_helper_product_uom_for_secondary(self):
         """Helper method to be called from onchange method of uom field in
         target model.
         """
-        if (
-            not self.secondary_uom_id
-            or self.secondary_uom_id.dependency_type == "independent"
-        ):
+        if not self.secondary_uom_id:
             self.secondary_uom_qty = 0.0
             return
+        elif self.secondary_uom_id.dependency_type == "independent":
+            return
         factor = self._get_factor_line()
         line_qty = self._get_quantity_from_line()
         qty = float_round(
diff --git a/product_secondary_unit/tests/test_secondary_unit_mixin.py b/product_secondary_unit/tests/test_secondary_unit_mixin.py
index 5df5387ada6..30f8d3ee11c 100644
--- a/product_secondary_unit/tests/test_secondary_unit_mixin.py
+++ b/product_secondary_unit/tests/test_secondary_unit_mixin.py
@@ -98,6 +98,7 @@ def test_product_secondary_unit_mixin_no_uom_onchange(self):
         # If secondary_uom_id is not informed secondary_uom_qty on source
         # model is not computed.
         fake_model = self.secondary_unit_fake
+        # import pdb ; pdb.set_trace()
         fake_model._onchange_helper_product_uom_for_secondary()
         self.assertEqual(fake_model.secondary_uom_qty, 0)
 
@@ -111,3 +112,16 @@ def test_chained_compute_field(self):
         fake_model.secondary_uom_id = self.secondary_unit_box_10
         self.assertEqual(fake_model.product_uom_qty, 20.0)
         self.assertEqual(fake_model.secondary_uom_qty, 2.0)
+
+    def test_independent_type(self):
+        # dependent type is already tested as dependency_type by default
+        fake_model = self.secondary_unit_fake
+        fake_model.secondary_uom_id = self.secondary_unit_box_5
+        fake_model.secondary_uom_id.write({"dependency_type": "independent"})
+        fake_model.write({"secondary_uom_qty": 2})
+        self.assertEqual(fake_model.product_uom_qty, 0)
+        self.assertEqual(fake_model.secondary_uom_qty, 2)
+
+        fake_model.write({"product_uom_qty": 17})
+        self.assertEqual(fake_model.secondary_uom_qty, 2)
+        self.assertEqual(fake_model.product_uom_qty, 17)

From 53e49a164baf7a04e06a4ddbba2fba5b1454a913 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Roche?= <kevin.roche@akretion.com>
Date: Tue, 7 Sep 2021 18:28:58 +0200
Subject: [PATCH 21/58] [14.0][FIX] secondary_uom: independent behavior

---
 product_secondary_unit/__manifest__.py                   | 2 +-
 .../models/product_secondary_unit_mixin.py               | 9 +++++----
 .../tests/test_secondary_unit_mixin.py                   | 6 +++++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index 5ec29145b27..5b99ef16fc8 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Product Secondary Unit",
     "summary": "Set a secondary unit per product",
-    "version": "14.0.1.0.1",
+    "version": "14.0.1.0.2",
     "development_status": "Production/Stable",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
diff --git a/product_secondary_unit/models/product_secondary_unit_mixin.py b/product_secondary_unit/models/product_secondary_unit_mixin.py
index 462f95706de..776d51c2d4f 100644
--- a/product_secondary_unit/models/product_secondary_unit_mixin.py
+++ b/product_secondary_unit/models/product_secondary_unit_mixin.py
@@ -85,14 +85,15 @@ def _compute_secondary_uom_qty(self):
     def _compute_helper_target_field_qty(self):
         """Set the target qty field defined in model"""
         for rec in self:
-            if (
-                not rec.secondary_uom_id
-                or rec.secondary_uom_id.dependency_type == "independent"
-            ):
+            if not rec.secondary_uom_id:
                 rec[rec._secondary_unit_fields["qty_field"]] = rec._origin[
                     rec._secondary_unit_fields["qty_field"]
                 ]
                 continue
+            if rec.secondary_uom_id.dependency_type == "independent":
+                if rec[rec._secondary_unit_fields["qty_field"]] == 0.0:
+                    rec[rec._secondary_unit_fields["qty_field"]] = 1.0
+                continue
             # To avoid recompute secondary_uom_qty field when
             # secondary_uom_id changes.
             rec.env.remove_to_compute(
diff --git a/product_secondary_unit/tests/test_secondary_unit_mixin.py b/product_secondary_unit/tests/test_secondary_unit_mixin.py
index 30f8d3ee11c..a23956d4321 100644
--- a/product_secondary_unit/tests/test_secondary_unit_mixin.py
+++ b/product_secondary_unit/tests/test_secondary_unit_mixin.py
@@ -119,9 +119,13 @@ def test_independent_type(self):
         fake_model.secondary_uom_id = self.secondary_unit_box_5
         fake_model.secondary_uom_id.write({"dependency_type": "independent"})
         fake_model.write({"secondary_uom_qty": 2})
-        self.assertEqual(fake_model.product_uom_qty, 0)
+        self.assertEqual(fake_model.product_uom_qty, 1)
         self.assertEqual(fake_model.secondary_uom_qty, 2)
 
         fake_model.write({"product_uom_qty": 17})
+        self.assertEqual(fake_model.product_uom_qty, 17)
         self.assertEqual(fake_model.secondary_uom_qty, 2)
+
+        fake_model.write({"secondary_uom_qty": 4})
         self.assertEqual(fake_model.product_uom_qty, 17)
+        self.assertEqual(fake_model.secondary_uom_qty, 4)

From 90e01610f91ee260a5483c5e42461ed3576957fa Mon Sep 17 00:00:00 2001
From: remihb <remi@hobo.live>
Date: Tue, 28 Dec 2021 11:06:37 +0100
Subject: [PATCH 22/58] [MIG] product_secondary_unit: Migration to 15.0

---
 product_secondary_unit/README.rst              | 10 +++++-----
 product_secondary_unit/__manifest__.py         |  2 +-
 product_secondary_unit/i18n/es.po              |  5 +++++
 product_secondary_unit/i18n/es_MX.po           |  5 +++++
 product_secondary_unit/i18n/fr.po              |  5 +++++
 .../i18n/product_secondary_unit.pot            | 18 ++++++------------
 .../models/product_second_unit.py              |  1 +
 .../models/product_template.py                 |  1 +
 .../static/description/index.html              |  6 +++---
 .../tests/test_product_second_unit.py          |  4 ++--
 .../tests/test_secondary_unit_mixin.py         |  2 +-
 product_secondary_unit/views/product_views.xml |  3 ++-
 12 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/product_secondary_unit/README.rst b/product_secondary_unit/README.rst
index 1f97e2e2f0a..74804d27088 100644
--- a/product_secondary_unit/README.rst
+++ b/product_secondary_unit/README.rst
@@ -14,13 +14,13 @@ Product 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%2Fproduct--attribute-lightgray.png?logo=github
-    :target: https://github.com/OCA/product-attribute/tree/14.0/product_secondary_unit
+    :target: https://github.com/OCA/product-attribute/tree/15.0/product_secondary_unit
     :alt: OCA/product-attribute
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/product-attribute-14-0/product-attribute-14-0-product_secondary_unit
+    :target: https://translation.odoo-community.org/projects/product-attribute-15-0/product-attribute-15-0-product_secondary_unit
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/135/14.0
+    :target: https://runbot.odoo-community.org/runbot/135/15.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -47,7 +47,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/product-attribute/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 <https://github.com/OCA/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/product-attribute/issues/new?body=module:%20product_secondary_unit%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.
 
@@ -89,6 +89,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-sergio-teruel| 
 
-This module is part of the `OCA/product-attribute <https://github.com/OCA/product-attribute/tree/14.0/product_secondary_unit>`_ project on GitHub.
+This module is part of the `OCA/product-attribute <https://github.com/OCA/product-attribute/tree/15.0/product_secondary_unit>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index 5b99ef16fc8..9af994423bd 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Product Secondary Unit",
     "summary": "Set a secondary unit per product",
-    "version": "14.0.1.0.2",
+    "version": "15.0.1.0.0",
     "development_status": "Production/Stable",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
diff --git a/product_secondary_unit/i18n/es.po b/product_secondary_unit/i18n/es.po
index 581ccd6c6ac..c56c0a89aa3 100644
--- a/product_secondary_unit/i18n/es.po
+++ b/product_secondary_unit/i18n/es.po
@@ -17,6 +17,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.4\n"
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__active
+msgid "Active"
+msgstr "Activo"
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__code
 msgid "Code"
diff --git a/product_secondary_unit/i18n/es_MX.po b/product_secondary_unit/i18n/es_MX.po
index 5040e4be51c..9e7f93f5070 100644
--- a/product_secondary_unit/i18n/es_MX.po
+++ b/product_secondary_unit/i18n/es_MX.po
@@ -16,6 +16,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10\n"
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__active
+msgid "Active"
+msgstr "Activo"
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__code
 msgid "Code"
diff --git a/product_secondary_unit/i18n/fr.po b/product_secondary_unit/i18n/fr.po
index f3acde2c776..fd111d23ad0 100644
--- a/product_secondary_unit/i18n/fr.po
+++ b/product_secondary_unit/i18n/fr.po
@@ -16,6 +16,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.10\n"
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__active
+msgid "Active"
+msgstr "Actif"
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__code
 msgid "Code"
diff --git a/product_secondary_unit/i18n/product_secondary_unit.pot b/product_secondary_unit/i18n/product_secondary_unit.pot
index d819f6b1233..410fd3d6aff 100644
--- a/product_secondary_unit/i18n/product_secondary_unit.pot
+++ b/product_secondary_unit/i18n/product_secondary_unit.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
+"Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -13,6 +13,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__active
+msgid "Active"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__code
 msgid "Code"
@@ -47,15 +52,11 @@ msgstr ""
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__display_name
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__id
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__id
 msgid "ID"
 msgstr ""
 
@@ -75,8 +76,6 @@ msgstr ""
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin____last_update
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -133,8 +132,3 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
 msgid "Secondary Unit of Measure"
 msgstr ""
-
-#. module: product_secondary_unit
-#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
-msgid "secondary Unit"
-msgstr ""
diff --git a/product_secondary_unit/models/product_second_unit.py b/product_secondary_unit/models/product_second_unit.py
index ccbf03f9063..999412552f7 100644
--- a/product_secondary_unit/models/product_second_unit.py
+++ b/product_secondary_unit/models/product_second_unit.py
@@ -37,6 +37,7 @@ class ProductSecondaryUnit(models.Model):
     factor = fields.Float(
         string="Secondary Unit Factor", default=1.0, digits=0, required=True
     )
+    active = fields.Boolean(default=True)
 
     def name_get(self):
         result = []
diff --git a/product_secondary_unit/models/product_template.py b/product_secondary_unit/models/product_template.py
index fba1099909d..e6d7725e133 100644
--- a/product_secondary_unit/models/product_template.py
+++ b/product_secondary_unit/models/product_template.py
@@ -11,6 +11,7 @@ class ProductTemplate(models.Model):
         inverse_name="product_tmpl_id",
         string="Secondary Unit of Measure",
         help="Default Secondary Unit of Measure.",
+        context={"active_test": False},
     )
 
     @api.model
diff --git a/product_secondary_unit/static/description/index.html b/product_secondary_unit/static/description/index.html
index 0372f8298ab..818f4040f1d 100644
--- a/product_secondary_unit/static/description/index.html
+++ b/product_secondary_unit/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Product Secondary Unit</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" 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" href="https://github.com/OCA/product-attribute/tree/14.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/product-attribute-14-0/product-attribute-14-0-product_secondary_unit"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/135/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" 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" href="https://github.com/OCA/product-attribute/tree/15.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/product-attribute-15-0/product-attribute-15-0-product_secondary_unit"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/135/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the functionality of product module to allow define other units with their conversion factor.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -396,7 +396,7 @@ <h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/product-attribute/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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2014.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/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2015.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">
@@ -426,7 +426,7 @@ <h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external" href="https://github.com/sergio-teruel"><img alt="sergio-teruel" src="https://github.com/sergio-teruel.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/product-attribute/tree/14.0/product_secondary_unit">OCA/product-attribute</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/product-attribute/tree/15.0/product_secondary_unit">OCA/product-attribute</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/product_secondary_unit/tests/test_product_second_unit.py b/product_secondary_unit/tests/test_product_second_unit.py
index c8dfa256baa..cb7b070e93b 100644
--- a/product_secondary_unit/tests/test_product_second_unit.py
+++ b/product_secondary_unit/tests/test_product_second_unit.py
@@ -1,10 +1,10 @@
 # Copyright 2018 Tecnativa - Sergio Teruel
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-from odoo.tests import SavepointCase, tagged
+from odoo.tests import TransactionCase, tagged
 
 
 @tagged("post_install", "-at_install")
-class TestProductSecondaryUnit(SavepointCase):
+class TestProductSecondaryUnit(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
diff --git a/product_secondary_unit/tests/test_secondary_unit_mixin.py b/product_secondary_unit/tests/test_secondary_unit_mixin.py
index a23956d4321..a840c1c429b 100644
--- a/product_secondary_unit/tests/test_secondary_unit_mixin.py
+++ b/product_secondary_unit/tests/test_secondary_unit_mixin.py
@@ -60,7 +60,7 @@ def setUpClass(cls):
     @classmethod
     def tearDownClass(cls):
         cls.loader.restore_registry()
-        super(TestProductSecondaryUnitMixin, cls).tearDownClass()
+        return super(TestProductSecondaryUnitMixin, cls).tearDownClass()
 
     def test_product_secondary_unit_mixin(self):
         fake_model = self.secondary_unit_fake
diff --git a/product_secondary_unit/views/product_views.xml b/product_secondary_unit/views/product_views.xml
index be13b315ad2..1463ec2c79f 100644
--- a/product_secondary_unit/views/product_views.xml
+++ b/product_secondary_unit/views/product_views.xml
@@ -11,7 +11,8 @@
             <xpath expr="//page[@name='general_information']" position="inside">
                 <group string="Secondary Unit of Measure">
                     <field name="secondary_uom_ids" nolabel="1">
-                        <tree string="secondary Unit" editable="top">
+                        <tree editable="top" decoration-muted="(not active)">
+                            <field name="active" widget="boolean_toggle" />
                             <field name="code" />
                             <field name="name" />
                             <field name="uom_id" />

From f82104ecbe8741e5615b2b151c2e984e6d5522bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Mon, 21 Nov 2022 09:37:03 +0100
Subject: [PATCH 23/58] [FIX] product_secondary_unit: Change SavepointCase to
 TransactionCase

---
 product_secondary_unit/__manifest__.py                    | 2 +-
 product_secondary_unit/tests/test_secondary_unit_mixin.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index 9af994423bd..0ba4f5023cb 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Product Secondary Unit",
     "summary": "Set a secondary unit per product",
-    "version": "15.0.1.0.0",
+    "version": "15.0.1.0.1",
     "development_status": "Production/Stable",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
diff --git a/product_secondary_unit/tests/test_secondary_unit_mixin.py b/product_secondary_unit/tests/test_secondary_unit_mixin.py
index a840c1c429b..75ca83e941b 100644
--- a/product_secondary_unit/tests/test_secondary_unit_mixin.py
+++ b/product_secondary_unit/tests/test_secondary_unit_mixin.py
@@ -2,10 +2,10 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from odoo_test_helper import FakeModelLoader
 
-from odoo.tests import SavepointCase
+from odoo.tests import TransactionCase
 
 
-class TestProductSecondaryUnitMixin(SavepointCase, FakeModelLoader):
+class TestProductSecondaryUnitMixin(TransactionCase, FakeModelLoader):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()

From e0a5f3aa93026c28c919966c1dcbcc672d64c3f9 Mon Sep 17 00:00:00 2001
From: sergio-teruel <sergio.teruel@tecnativa.com>
Date: Wed, 11 Jan 2023 05:37:42 +0100
Subject: [PATCH 24/58] [IMP] product_secondary_unit: Compatibility with
 product variants TT40323

---
 product_secondary_unit/i18n/es.po             | 44 +++++-----
 .../i18n/product_secondary_unit.pot           | 13 +++
 product_secondary_unit/models/__init__.py     |  1 +
 .../models/product_product.py                 | 15 ++++
 .../models/product_second_unit.py             |  5 ++
 .../views/product_views.xml                   | 82 ++++++++++++++++++-
 6 files changed, 136 insertions(+), 24 deletions(-)
 create mode 100644 product_secondary_unit/models/product_product.py

diff --git a/product_secondary_unit/i18n/es.po b/product_secondary_unit/i18n/es.po
index c56c0a89aa3..7dab134b9ec 100644
--- a/product_secondary_unit/i18n/es.po
+++ b/product_secondary_unit/i18n/es.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-26 10:00+0000\n"
-"PO-Revision-Date: 2019-02-08 13:50+0000\n"
-"Last-Translator: Marta Vázquez Rodríguez <vazrodmar@gmail.com>\n"
+"POT-Creation-Date: 2023-01-11 04:38+0000\n"
+"PO-Revision-Date: 2023-01-11 05:40+0100\n"
+"Last-Translator: Sergio Teruel <sergio.teruel@tecnativa.com>\n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.4\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__active
@@ -47,24 +47,20 @@ msgstr "Segunda unidad de medida por defecto."
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__dependency_type
 msgid "Dependency Type"
-msgstr ""
+msgstr "Tipo de dependencia"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__dependent
 msgid "Dependent"
-msgstr ""
+msgstr "Dependiente"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__display_name
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__display_name
 msgid "Display Name"
 msgstr "Mostrar nombre"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__id
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__id
 msgid "ID"
 msgstr "ID (Identificador)"
 
@@ -84,8 +80,6 @@ msgstr ""
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin____last_update
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
@@ -104,16 +98,20 @@ msgstr "Última actualización en"
 msgid "Name"
 msgstr "Nombre"
 
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_product
+msgid "Product"
+msgstr "Producto"
+
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
-#, fuzzy
 msgid "Product Secondary Unit"
-msgstr "'product.secondary.unit'"
+msgstr "Unidad secundaria del producto"
 
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_secondary_unit_mixin
 msgid "Product Secondary Unit Mixin"
-msgstr ""
+msgstr "Producto Unidad secundaria Mixin"
 
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_template
@@ -121,15 +119,20 @@ msgstr ""
 msgid "Product Template"
 msgstr "Plantilla de producto"
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_id
+msgid "Product Variant"
+msgstr "Variante de producto"
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_id
 msgid "Second unit"
-msgstr ""
+msgstr "Unidad secundaria"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_qty
 msgid "Secondary Qty"
-msgstr ""
+msgstr "Cta. Ud. secundaria"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__factor
@@ -141,13 +144,12 @@ msgstr "Factor segunda unidad"
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__uom_id
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
 #: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_variant_easy_edit_view
 msgid "Secondary Unit of Measure"
 msgstr "Segunda unidad de medida"
 
-#. module: product_secondary_unit
-#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
-msgid "secondary Unit"
-msgstr "Unidad Secundaria"
+#~ msgid "secondary Unit"
+#~ msgstr "Unidad Secundaria"
 
 #~ msgid "secondary unit of measure"
 #~ msgstr "Segunda unidad de medida"
diff --git a/product_secondary_unit/i18n/product_secondary_unit.pot b/product_secondary_unit/i18n/product_secondary_unit.pot
index 410fd3d6aff..0dd0516448c 100644
--- a/product_secondary_unit/i18n/product_secondary_unit.pot
+++ b/product_secondary_unit/i18n/product_secondary_unit.pot
@@ -6,6 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-01-11 04:38+0000\n"
+"PO-Revision-Date: 2023-01-11 04:38+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -94,6 +96,11 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_product
+msgid "Product"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
 msgid "Product Secondary Unit"
@@ -110,6 +117,11 @@ msgstr ""
 msgid "Product Template"
 msgstr ""
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_id
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_id
 msgid "Second unit"
@@ -130,5 +142,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__uom_id
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
 #: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_variant_easy_edit_view
 msgid "Secondary Unit of Measure"
 msgstr ""
diff --git a/product_secondary_unit/models/__init__.py b/product_secondary_unit/models/__init__.py
index 9af876b23b2..0f06812747f 100644
--- a/product_secondary_unit/models/__init__.py
+++ b/product_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_second_unit
 from . import product_secondary_unit_mixin
 from . import product_template
diff --git a/product_secondary_unit/models/product_product.py b/product_secondary_unit/models/product_product.py
new file mode 100644
index 00000000000..5930ce34239
--- /dev/null
+++ b/product_secondary_unit/models/product_product.py
@@ -0,0 +1,15 @@
+# Copyright 2023 Tecnativa - Sergio Teruel
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class ProductProduct(models.Model):
+    _inherit = "product.product"
+
+    secondary_uom_ids = fields.One2many(
+        comodel_name="product.secondary.unit",
+        inverse_name="product_id",
+        string="Secondary Unit of Measure",
+        help="Default Secondary Unit of Measure.",
+        context={"active_test": False},
+    )
diff --git a/product_secondary_unit/models/product_second_unit.py b/product_secondary_unit/models/product_second_unit.py
index 999412552f7..c9307b65f62 100644
--- a/product_secondary_unit/models/product_second_unit.py
+++ b/product_secondary_unit/models/product_second_unit.py
@@ -15,6 +15,11 @@ class ProductSecondaryUnit(models.Model):
         required=True,
         ondelete="cascade",
     )
+    product_id = fields.Many2one(
+        comodel_name="product.product",
+        string="Product Variant",
+        ondelete="cascade",
+    )
     uom_id = fields.Many2one(
         comodel_name="uom.uom",
         string="Secondary Unit of Measure",
diff --git a/product_secondary_unit/views/product_views.xml b/product_secondary_unit/views/product_views.xml
index 1463ec2c79f..b0e028c5ca9 100644
--- a/product_secondary_unit/views/product_views.xml
+++ b/product_secondary_unit/views/product_views.xml
@@ -2,17 +2,25 @@
 <!-- Copyright 2018 Tecnativa - Sergio Teruel
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
-    <record id="product_template_form_view" model="ir.ui.view">
+    <record id="product_template_only_form_view" model="ir.ui.view">
         <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="inherit_id" ref="product.product_template_only_form_view" />
         <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
         <field name="arch" type="xml">
             <xpath expr="//page[@name='general_information']" position="inside">
                 <group string="Secondary Unit of Measure">
                     <field name="secondary_uom_ids" nolabel="1">
-                        <tree editable="top" decoration-muted="(not active)">
+                        <tree editable="bottom" decoration-muted="(not active)">
                             <field name="active" widget="boolean_toggle" />
+                            <field name="product_tmpl_id" invisible="1" />
+                            <field
+                                name="product_id"
+                                domain="[('product_tmpl_id', '=', parent.id)]"
+                                groups="product.group_product_variant"
+                                options="{'no_create': True}"
+                                attrs="{'column_invisible': [('parent.product_variant_count', '&lt;=', 1)]}"
+                            />
                             <field name="code" />
                             <field name="name" />
                             <field name="uom_id" />
@@ -24,4 +32,72 @@
             </xpath>
         </field>
     </record>
+
+    <record id="product_normal_form_view" model="ir.ui.view">
+        <field name="name">Product Secondary Unit</field>
+        <field name="model">product.product</field>
+        <field name="inherit_id" ref="product.product_normal_form_view" />
+        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
+        <field name="arch" type="xml">
+            <xpath expr="//page[@name='general_information']" position="inside">
+                <group string="Variant Specific Secondary Unit of Measure">
+                    <field
+                        name="secondary_uom_ids"
+                        nolabel="1"
+                        context="{'default_product_tmpl_id': product_tmpl_id}"
+                    >
+                        <tree editable="bottom" decoration-muted="(not active)">
+                            <field name="active" widget="boolean_toggle" />
+                            <field name="product_tmpl_id" invisible="1" />
+                            <field
+                                name="product_id"
+                                domain="[('product_tmpl_id', '=', parent.id)]"
+                                groups="product.group_product_variant"
+                                options="{'no_create': True}"
+                                attrs="{'column_invisible': [('parent.product_variant_count', '&lt;=', 1)]}"
+                            />
+                            <field name="code" />
+                            <field name="name" />
+                            <field name="uom_id" />
+                            <field name="factor" />
+                            <field name="dependency_type" />
+                        </tree>
+                    </field>
+                </group>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="product_variant_easy_edit_view" model="ir.ui.view">
+        <field name="model">product.product</field>
+        <field name="inherit_id" ref="product.product_variant_easy_edit_view" />
+        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='weight']/.." position="after">
+                <field name="product_tmpl_id" invisible="1" />
+                <group string="Secondary Unit of Measure" name="secondary_uom">
+                    <group name="default_secondary_uom" />
+                    <group colspan="2">
+                        <field
+                            name="secondary_uom_ids"
+                            nolabel="1"
+                            context="{'default_product_tmpl_id': product_tmpl_id}"
+                        >
+                            <tree editable="bottom" decoration-muted="(not active)">
+                                <field name="active" widget="boolean_toggle" />
+                                <field name="product_tmpl_id" invisible="1" />
+                                <field name="product_id" invisible="1" />
+                                <field name="code" />
+                                <field name="name" />
+                                <field name="uom_id" />
+                                <field name="factor" />
+                                <field name="dependency_type" />
+                            </tree>
+                        </field>
+                    </group>
+                </group>
+            </xpath>
+        </field>
+    </record>
+
 </odoo>

From ff3c4d355788f6c32a1f9f27dc8b9e2a9984f34c Mon Sep 17 00:00:00 2001
From: sergio-teruel <sergio.teruel@tecnativa.com>
Date: Thu, 9 Mar 2023 18:09:57 +0100
Subject: [PATCH 25/58] [FIX] product_secondary_unit: Fix rounding secondary
 uom

---
 product_secondary_unit/models/product_secondary_unit_mixin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/product_secondary_unit/models/product_secondary_unit_mixin.py b/product_secondary_unit/models/product_secondary_unit_mixin.py
index 776d51c2d4f..7aff8a76cb8 100644
--- a/product_secondary_unit/models/product_secondary_unit_mixin.py
+++ b/product_secondary_unit/models/product_secondary_unit_mixin.py
@@ -119,6 +119,6 @@ def _onchange_helper_product_uom_for_secondary(self):
         line_qty = self._get_quantity_from_line()
         qty = float_round(
             line_qty / (factor or 1.0),
-            precision_rounding=self._get_uom_line().rounding,
+            precision_rounding=self.secondary_uom_id.uom_id.rounding,
         )
         self.secondary_uom_qty = qty

From 3d84b76ae3eced3dc364d3049246cf25ee35bcce Mon Sep 17 00:00:00 2001
From: sergio-teruel <sergio.teruel@tecnativa.com>
Date: Tue, 14 Mar 2023 13:14:44 +0100
Subject: [PATCH 26/58] [FIX] product_secondary_unit: Apply the default value
 defined in source qty field

---
 .../models/product_secondary_unit_mixin.py      | 17 +++++++++++++----
 .../tests/test_secondary_unit_mixin.py          |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/product_secondary_unit/models/product_secondary_unit_mixin.py b/product_secondary_unit/models/product_secondary_unit_mixin.py
index 7aff8a76cb8..f124f01c6df 100644
--- a/product_secondary_unit/models/product_secondary_unit_mixin.py
+++ b/product_secondary_unit/models/product_secondary_unit_mixin.py
@@ -82,17 +82,26 @@ def _compute_secondary_uom_qty(self):
             )
             line.secondary_uom_qty = qty
 
+    def _get_default_value_for_qty_field(self):
+        return self.default_get([self._secondary_unit_fields["qty_field"]]).get(
+            self._secondary_unit_fields["qty_field"]
+        )
+
     def _compute_helper_target_field_qty(self):
         """Set the target qty field defined in model"""
+        default_qty_field_value = self._get_default_value_for_qty_field()
         for rec in self:
             if not rec.secondary_uom_id:
-                rec[rec._secondary_unit_fields["qty_field"]] = rec._origin[
-                    rec._secondary_unit_fields["qty_field"]
-                ]
+                rec[rec._secondary_unit_fields["qty_field"]] = (
+                    rec._origin[rec._secondary_unit_fields["qty_field"]]
+                    or default_qty_field_value
+                )
                 continue
             if rec.secondary_uom_id.dependency_type == "independent":
                 if rec[rec._secondary_unit_fields["qty_field"]] == 0.0:
-                    rec[rec._secondary_unit_fields["qty_field"]] = 1.0
+                    rec[
+                        rec._secondary_unit_fields["qty_field"]
+                    ] = default_qty_field_value
                 continue
             # To avoid recompute secondary_uom_qty field when
             # secondary_uom_id changes.
diff --git a/product_secondary_unit/tests/test_secondary_unit_mixin.py b/product_secondary_unit/tests/test_secondary_unit_mixin.py
index 75ca83e941b..e0ff1b4dcdd 100644
--- a/product_secondary_unit/tests/test_secondary_unit_mixin.py
+++ b/product_secondary_unit/tests/test_secondary_unit_mixin.py
@@ -119,7 +119,7 @@ def test_independent_type(self):
         fake_model.secondary_uom_id = self.secondary_unit_box_5
         fake_model.secondary_uom_id.write({"dependency_type": "independent"})
         fake_model.write({"secondary_uom_qty": 2})
-        self.assertEqual(fake_model.product_uom_qty, 1)
+        self.assertEqual(fake_model.product_uom_qty, 0.0)
         self.assertEqual(fake_model.secondary_uom_qty, 2)
 
         fake_model.write({"product_uom_qty": 17})

From c713e4db202056a151262f42985a421b2dc7d2ac Mon Sep 17 00:00:00 2001
From: sergio-teruel <sergio.teruel@tecnativa.com>
Date: Wed, 15 Mar 2023 14:02:41 +0100
Subject: [PATCH 27/58] [IMP] product_secondary_unit: Access to template
 secondary_uom_ids from variants

---
 product_secondary_unit/__manifest__.py        |  2 +-
 product_secondary_unit/i18n/es.po             |  1 -
 product_secondary_unit/i18n/es_MX.po          | 22 ++++---
 product_secondary_unit/i18n/fr.po             | 22 ++++---
 .../i18n/product_secondary_unit.pot           |  3 -
 product_secondary_unit/i18n/zh_CN.po          | 27 +++++---
 .../models/product_product.py                 | 22 ++++++-
 .../views/product_views.xml                   | 66 ++-----------------
 8 files changed, 70 insertions(+), 95 deletions(-)

diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index 0ba4f5023cb..b2d13a12107 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Product Secondary Unit",
     "summary": "Set a secondary unit per product",
-    "version": "15.0.1.0.1",
+    "version": "15.0.2.0.0",
     "development_status": "Production/Stable",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
diff --git a/product_secondary_unit/i18n/es.po b/product_secondary_unit/i18n/es.po
index 7dab134b9ec..909e019097c 100644
--- a/product_secondary_unit/i18n/es.po
+++ b/product_secondary_unit/i18n/es.po
@@ -144,7 +144,6 @@ msgstr "Factor segunda unidad"
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__uom_id
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
 #: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
-#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_variant_easy_edit_view
 msgid "Secondary Unit of Measure"
 msgstr "Segunda unidad de medida"
 
diff --git a/product_secondary_unit/i18n/es_MX.po b/product_secondary_unit/i18n/es_MX.po
index 9e7f93f5070..fb94cdd6a20 100644
--- a/product_secondary_unit/i18n/es_MX.po
+++ b/product_secondary_unit/i18n/es_MX.po
@@ -55,15 +55,11 @@ msgstr ""
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__display_name
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__display_name
 msgid "Display Name"
 msgstr "Nombre para Mostrar"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__id
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -83,8 +79,6 @@ msgstr ""
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin____last_update
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Última Actualización en"
 
@@ -103,6 +97,11 @@ msgstr "Última Actualización en"
 msgid "Name"
 msgstr "Nombre"
 
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_product
+msgid "Product"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
 msgid "Product Secondary Unit"
@@ -119,6 +118,11 @@ msgstr ""
 msgid "Product Template"
 msgstr "Plantilla de Producto"
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_id
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_id
 msgid "Second unit"
@@ -142,10 +146,8 @@ msgstr "Factor de Unidad Secundaria"
 msgid "Secondary Unit of Measure"
 msgstr "Unidad de Medida Secundaria"
 
-#. module: product_secondary_unit
-#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
-msgid "secondary Unit"
-msgstr "Unidad Secundaria"
+#~ msgid "secondary Unit"
+#~ msgstr "Unidad Secundaria"
 
 #~ msgid "secondary unit of measure"
 #~ msgstr "unidad de medida secundaria"
diff --git a/product_secondary_unit/i18n/fr.po b/product_secondary_unit/i18n/fr.po
index fd111d23ad0..65c8c112e32 100644
--- a/product_secondary_unit/i18n/fr.po
+++ b/product_secondary_unit/i18n/fr.po
@@ -55,15 +55,11 @@ msgstr ""
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__display_name
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__display_name
 msgid "Display Name"
 msgstr "Nom affiché"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__id
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -83,8 +79,6 @@ msgstr ""
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin____last_update
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "Dernière Modification le"
 
@@ -103,6 +97,11 @@ msgstr "Dernière mise à jour le"
 msgid "Name"
 msgstr "Nom"
 
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_product
+msgid "Product"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
 msgid "Product Secondary Unit"
@@ -119,6 +118,11 @@ msgstr ""
 msgid "Product Template"
 msgstr "Modèle de produit"
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_id
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_id
 msgid "Second unit"
@@ -142,10 +146,8 @@ msgstr "Facteur de l'unité secondaire"
 msgid "Secondary Unit of Measure"
 msgstr "Unité de mesure secondaire"
 
-#. module: product_secondary_unit
-#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
-msgid "secondary Unit"
-msgstr "Unité secondaire"
+#~ msgid "secondary Unit"
+#~ msgstr "Unité secondaire"
 
 #~ msgid "secondary unit of measure"
 #~ msgstr "Unité de mesure secondaire"
diff --git a/product_secondary_unit/i18n/product_secondary_unit.pot b/product_secondary_unit/i18n/product_secondary_unit.pot
index 0dd0516448c..63178a96989 100644
--- a/product_secondary_unit/i18n/product_secondary_unit.pot
+++ b/product_secondary_unit/i18n/product_secondary_unit.pot
@@ -6,8 +6,6 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-01-11 04:38+0000\n"
-"PO-Revision-Date: 2023-01-11 04:38+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -142,6 +140,5 @@ msgstr ""
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__uom_id
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
 #: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
-#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_variant_easy_edit_view
 msgid "Secondary Unit of Measure"
 msgstr ""
diff --git a/product_secondary_unit/i18n/zh_CN.po b/product_secondary_unit/i18n/zh_CN.po
index d1df9d069e3..a1b83146ab1 100644
--- a/product_secondary_unit/i18n/zh_CN.po
+++ b/product_secondary_unit/i18n/zh_CN.po
@@ -16,6 +16,11 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 3.8\n"
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__active
+msgid "Active"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__code
 msgid "Code"
@@ -50,15 +55,11 @@ msgstr ""
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__display_name
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__display_name
 msgid "Display Name"
 msgstr "显示名称"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__id
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__id
 msgid "ID"
 msgstr "ID"
 
@@ -78,8 +79,6 @@ msgstr ""
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin____last_update
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template____last_update
 msgid "Last Modified on"
 msgstr "最后修改于"
 
@@ -98,6 +97,11 @@ msgstr "最后更新于"
 msgid "Name"
 msgstr "名称"
 
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_product
+msgid "Product"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
 msgid "Product Secondary Unit"
@@ -114,6 +118,11 @@ msgstr ""
 msgid "Product Template"
 msgstr "产品模版"
 
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_id
+msgid "Product Variant"
+msgstr ""
+
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_id
 msgid "Second unit"
@@ -137,10 +146,8 @@ msgstr "转换率"
 msgid "Secondary Unit of Measure"
 msgstr "辅助计量单位"
 
-#. module: product_secondary_unit
-#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
-msgid "secondary Unit"
-msgstr "辅助计量单位"
+#~ msgid "secondary Unit"
+#~ msgstr "辅助计量单位"
 
 #~ msgid "secondary unit of measure"
 #~ msgstr "辅助计量单位"
diff --git a/product_secondary_unit/models/product_product.py b/product_secondary_unit/models/product_product.py
index 5930ce34239..5e6e67d55db 100644
--- a/product_secondary_unit/models/product_product.py
+++ b/product_secondary_unit/models/product_product.py
@@ -1,6 +1,6 @@
 # Copyright 2023 Tecnativa - Sergio Teruel
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-from odoo import fields, models
+from odoo import api, fields, models
 
 
 class ProductProduct(models.Model):
@@ -12,4 +12,24 @@ class ProductProduct(models.Model):
         string="Secondary Unit of Measure",
         help="Default Secondary Unit of Measure.",
         context={"active_test": False},
+        compute="_compute_secondary_uom_ids",
+        inverse="_inverse_secondary_uom_ids",
     )
+
+    @api.depends("product_tmpl_id")
+    def _compute_secondary_uom_ids(self):
+        for variant in self:
+            variant.secondary_uom_ids = (
+                variant.product_tmpl_id.secondary_uom_ids.filtered(
+                    lambda s: s.product_id == variant or not s.product_id
+                )
+            )
+
+    def _inverse_secondary_uom_ids(self):
+        for variant in self:
+            variant.product_tmpl_id.secondary_uom_ids = (
+                variant.product_tmpl_id.secondary_uom_ids.filtered(
+                    lambda s: s.product_id != variant
+                )
+                + variant.secondary_uom_ids
+            )
diff --git a/product_secondary_unit/views/product_views.xml b/product_secondary_unit/views/product_views.xml
index b0e028c5ca9..f8cbf3dcae1 100644
--- a/product_secondary_unit/views/product_views.xml
+++ b/product_secondary_unit/views/product_views.xml
@@ -2,10 +2,10 @@
 <!-- Copyright 2018 Tecnativa - Sergio Teruel
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
-    <record id="product_template_only_form_view" model="ir.ui.view">
+    <record id="product_template_form_view" model="ir.ui.view">
         <field name="name">Product template Secondary Unit</field>
         <field name="model">product.template</field>
-        <field name="inherit_id" ref="product.product_template_only_form_view" />
+        <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">
             <xpath expr="//page[@name='general_information']" position="inside">
@@ -39,63 +39,11 @@
         <field name="inherit_id" ref="product.product_normal_form_view" />
         <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
         <field name="arch" type="xml">
-            <xpath expr="//page[@name='general_information']" position="inside">
-                <group string="Variant Specific Secondary Unit of Measure">
-                    <field
-                        name="secondary_uom_ids"
-                        nolabel="1"
-                        context="{'default_product_tmpl_id': product_tmpl_id}"
-                    >
-                        <tree editable="bottom" decoration-muted="(not active)">
-                            <field name="active" widget="boolean_toggle" />
-                            <field name="product_tmpl_id" invisible="1" />
-                            <field
-                                name="product_id"
-                                domain="[('product_tmpl_id', '=', parent.id)]"
-                                groups="product.group_product_variant"
-                                options="{'no_create': True}"
-                                attrs="{'column_invisible': [('parent.product_variant_count', '&lt;=', 1)]}"
-                            />
-                            <field name="code" />
-                            <field name="name" />
-                            <field name="uom_id" />
-                            <field name="factor" />
-                            <field name="dependency_type" />
-                        </tree>
-                    </field>
-                </group>
-            </xpath>
-        </field>
-    </record>
-
-    <record id="product_variant_easy_edit_view" model="ir.ui.view">
-        <field name="model">product.product</field>
-        <field name="inherit_id" ref="product.product_variant_easy_edit_view" />
-        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
-        <field name="arch" type="xml">
-            <xpath expr="//group[@name='weight']/.." position="after">
-                <field name="product_tmpl_id" invisible="1" />
-                <group string="Secondary Unit of Measure" name="secondary_uom">
-                    <group name="default_secondary_uom" />
-                    <group colspan="2">
-                        <field
-                            name="secondary_uom_ids"
-                            nolabel="1"
-                            context="{'default_product_tmpl_id': product_tmpl_id}"
-                        >
-                            <tree editable="bottom" decoration-muted="(not active)">
-                                <field name="active" widget="boolean_toggle" />
-                                <field name="product_tmpl_id" invisible="1" />
-                                <field name="product_id" invisible="1" />
-                                <field name="code" />
-                                <field name="name" />
-                                <field name="uom_id" />
-                                <field name="factor" />
-                                <field name="dependency_type" />
-                            </tree>
-                        </field>
-                    </group>
-                </group>
+            <xpath
+                expr="//field[@name='secondary_uom_ids']/tree/field[@name='product_id']"
+                position="attributes"
+            >
+                <attribute name="domain">[('id', '=', parent.id)]</attribute>
             </xpath>
         </field>
     </record>

From d5a9169be6e18906fa37e8c620e94c4f3e9921c7 Mon Sep 17 00:00:00 2001
From: remihb <remi@hobo.live>
Date: Tue, 18 Apr 2023 13:40:46 +0200
Subject: [PATCH 28/58] [MIG] product_secondary_unit: Migration to 16.0

---
 product_secondary_unit/README.rst                 | 10 +++++-----
 product_secondary_unit/__manifest__.py            |  2 +-
 product_secondary_unit/i18n/es.po                 |  4 ++--
 product_secondary_unit/i18n/es_MX.po              |  4 ++--
 product_secondary_unit/i18n/fr.po                 |  4 ++--
 .../i18n/product_secondary_unit.pot               |  6 +++---
 product_secondary_unit/i18n/zh_CN.po              |  4 ++--
 .../models/product_second_unit.py                 |  4 +---
 .../models/product_secondary_unit_mixin.py        | 10 +++++++++-
 .../static/description/index.html                 |  6 +++---
 product_secondary_unit/views/product_views.xml    | 15 ++++++++++-----
 11 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/product_secondary_unit/README.rst b/product_secondary_unit/README.rst
index 74804d27088..236a4420137 100644
--- a/product_secondary_unit/README.rst
+++ b/product_secondary_unit/README.rst
@@ -14,13 +14,13 @@ Product 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%2Fproduct--attribute-lightgray.png?logo=github
-    :target: https://github.com/OCA/product-attribute/tree/15.0/product_secondary_unit
+    :target: https://github.com/OCA/product-attribute/tree/16.0/product_secondary_unit
     :alt: OCA/product-attribute
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/product-attribute-15-0/product-attribute-15-0-product_secondary_unit
+    :target: https://translation.odoo-community.org/projects/product-attribute-16-0/product-attribute-16-0-product_secondary_unit
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/135/15.0
+    :target: https://runbot.odoo-community.org/runbot/135/16.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -47,7 +47,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/product-attribute/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 <https://github.com/OCA/product-attribute/issues/new?body=module:%20product_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/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2016.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.
 
@@ -89,6 +89,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-sergio-teruel| 
 
-This module is part of the `OCA/product-attribute <https://github.com/OCA/product-attribute/tree/15.0/product_secondary_unit>`_ project on GitHub.
+This module is part of the `OCA/product-attribute <https://github.com/OCA/product-attribute/tree/16.0/product_secondary_unit>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index b2d13a12107..2e4dbc1adca 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Product Secondary Unit",
     "summary": "Set a secondary unit per product",
-    "version": "15.0.2.0.0",
+    "version": "16.0.1.0.0",
     "development_status": "Production/Stable",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
diff --git a/product_secondary_unit/i18n/es.po b/product_secondary_unit/i18n/es.po
index 909e019097c..fcceea3e13f 100644
--- a/product_secondary_unit/i18n/es.po
+++ b/product_secondary_unit/i18n/es.po
@@ -99,7 +99,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: product_secondary_unit
-#: model:ir.model,name:product_secondary_unit.model_product_product
+#: model:ir.model,name:product_secondary_unit.model_product_template
 msgid "Product"
 msgstr "Producto"
 
@@ -114,12 +114,12 @@ msgid "Product Secondary Unit Mixin"
 msgstr "Producto Unidad secundaria Mixin"
 
 #. module: product_secondary_unit
-#: model:ir.model,name:product_secondary_unit.model_product_template
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
 msgid "Product Template"
 msgstr "Plantilla de producto"
 
 #. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_product
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_id
 msgid "Product Variant"
 msgstr "Variante de producto"
diff --git a/product_secondary_unit/i18n/es_MX.po b/product_secondary_unit/i18n/es_MX.po
index fb94cdd6a20..e5ac58543d8 100644
--- a/product_secondary_unit/i18n/es_MX.po
+++ b/product_secondary_unit/i18n/es_MX.po
@@ -98,7 +98,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: product_secondary_unit
-#: model:ir.model,name:product_secondary_unit.model_product_product
+#: model:ir.model,name:product_secondary_unit.model_product_template
 msgid "Product"
 msgstr ""
 
@@ -113,12 +113,12 @@ msgid "Product Secondary Unit Mixin"
 msgstr ""
 
 #. module: product_secondary_unit
-#: model:ir.model,name:product_secondary_unit.model_product_template
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
 msgid "Product Template"
 msgstr "Plantilla de Producto"
 
 #. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_product
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_id
 msgid "Product Variant"
 msgstr ""
diff --git a/product_secondary_unit/i18n/fr.po b/product_secondary_unit/i18n/fr.po
index 65c8c112e32..90d52b7b181 100644
--- a/product_secondary_unit/i18n/fr.po
+++ b/product_secondary_unit/i18n/fr.po
@@ -98,7 +98,7 @@ msgid "Name"
 msgstr "Nom"
 
 #. module: product_secondary_unit
-#: model:ir.model,name:product_secondary_unit.model_product_product
+#: model:ir.model,name:product_secondary_unit.model_product_template
 msgid "Product"
 msgstr ""
 
@@ -113,12 +113,12 @@ msgid "Product Secondary Unit Mixin"
 msgstr ""
 
 #. module: product_secondary_unit
-#: model:ir.model,name:product_secondary_unit.model_product_template
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
 msgid "Product Template"
 msgstr "Modèle de produit"
 
 #. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_product
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_id
 msgid "Product Variant"
 msgstr ""
diff --git a/product_secondary_unit/i18n/product_secondary_unit.pot b/product_secondary_unit/i18n/product_secondary_unit.pot
index 63178a96989..ef677d11cf8 100644
--- a/product_secondary_unit/i18n/product_secondary_unit.pot
+++ b/product_secondary_unit/i18n/product_secondary_unit.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 15.0\n"
+"Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -95,7 +95,7 @@ msgid "Name"
 msgstr ""
 
 #. module: product_secondary_unit
-#: model:ir.model,name:product_secondary_unit.model_product_product
+#: model:ir.model,name:product_secondary_unit.model_product_template
 msgid "Product"
 msgstr ""
 
@@ -110,12 +110,12 @@ msgid "Product Secondary Unit Mixin"
 msgstr ""
 
 #. module: product_secondary_unit
-#: model:ir.model,name:product_secondary_unit.model_product_template
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
 msgid "Product Template"
 msgstr ""
 
 #. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_product
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_id
 msgid "Product Variant"
 msgstr ""
diff --git a/product_secondary_unit/i18n/zh_CN.po b/product_secondary_unit/i18n/zh_CN.po
index a1b83146ab1..be5d3ab07c8 100644
--- a/product_secondary_unit/i18n/zh_CN.po
+++ b/product_secondary_unit/i18n/zh_CN.po
@@ -98,7 +98,7 @@ msgid "Name"
 msgstr "名称"
 
 #. module: product_secondary_unit
-#: model:ir.model,name:product_secondary_unit.model_product_product
+#: model:ir.model,name:product_secondary_unit.model_product_template
 msgid "Product"
 msgstr ""
 
@@ -113,12 +113,12 @@ msgid "Product Secondary Unit Mixin"
 msgstr ""
 
 #. module: product_secondary_unit
-#: model:ir.model,name:product_secondary_unit.model_product_template
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
 msgid "Product Template"
 msgstr "产品模版"
 
 #. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_product
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_id
 msgid "Product Variant"
 msgstr ""
diff --git a/product_secondary_unit/models/product_second_unit.py b/product_secondary_unit/models/product_second_unit.py
index c9307b65f62..47a758b7dc5 100644
--- a/product_secondary_unit/models/product_second_unit.py
+++ b/product_secondary_unit/models/product_second_unit.py
@@ -39,9 +39,7 @@ class ProductSecondaryUnit(models.Model):
         "by package (1 unit for example) and you want to put the "
         "real time (ex : 4 hours) to allows employee scheduling",
     )
-    factor = fields.Float(
-        string="Secondary Unit Factor", default=1.0, digits=0, required=True
-    )
+    factor = fields.Float(string="Secondary Unit Factor", default=1.0, required=True)
     active = fields.Boolean(default=True)
 
     def name_get(self):
diff --git a/product_secondary_unit/models/product_secondary_unit_mixin.py b/product_secondary_unit/models/product_secondary_unit_mixin.py
index f124f01c6df..e2feac544d3 100644
--- a/product_secondary_unit/models/product_secondary_unit_mixin.py
+++ b/product_secondary_unit/models/product_secondary_unit_mixin.py
@@ -42,7 +42,6 @@ def _get_default_secondary_uom(self):
         store=True,
         readonly=False,
         compute="_compute_secondary_uom_qty",
-        default="1",
     )
     secondary_uom_id = fields.Many2one(
         comodel_name="product.secondary.unit",
@@ -131,3 +130,12 @@ def _onchange_helper_product_uom_for_secondary(self):
             precision_rounding=self.secondary_uom_id.uom_id.rounding,
         )
         self.secondary_uom_qty = qty
+
+    @api.model
+    def default_get(self, fields_list):
+        defaults = super().default_get(fields_list)
+        if self.secondary_uom_id and not self.env.context.get(
+            "skip_default_secondary_uom_qty", False
+        ):
+            defaults["secondary_uom_qty"] = 1.0
+        return defaults
diff --git a/product_secondary_unit/static/description/index.html b/product_secondary_unit/static/description/index.html
index 818f4040f1d..4df7c2cf97a 100644
--- a/product_secondary_unit/static/description/index.html
+++ b/product_secondary_unit/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Product Secondary Unit</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" 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" href="https://github.com/OCA/product-attribute/tree/15.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/product-attribute-15-0/product-attribute-15-0-product_secondary_unit"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/135/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" 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" href="https://github.com/OCA/product-attribute/tree/16.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/product-attribute-16-0/product-attribute-16-0-product_secondary_unit"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/135/16.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the functionality of product module to allow define other units with their conversion factor.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -396,7 +396,7 @@ <h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/product-attribute/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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/product-attribute/issues/new?body=module:%20product_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/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2016.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">
@@ -426,7 +426,7 @@ <h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external" href="https://github.com/sergio-teruel"><img alt="sergio-teruel" src="https://github.com/sergio-teruel.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/product-attribute/tree/15.0/product_secondary_unit">OCA/product-attribute</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/product-attribute/tree/16.0/product_secondary_unit">OCA/product-attribute</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/product_secondary_unit/views/product_views.xml b/product_secondary_unit/views/product_views.xml
index f8cbf3dcae1..4c628165624 100644
--- a/product_secondary_unit/views/product_views.xml
+++ b/product_secondary_unit/views/product_views.xml
@@ -6,11 +6,17 @@
         <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">
-            <xpath expr="//page[@name='general_information']" position="inside">
-                <group string="Secondary Unit of Measure">
-                    <field name="secondary_uom_ids" nolabel="1">
+            <xpath
+                expr="//page[@name='general_information']/group[last()]"
+                position="after"
+            >
+                <group
+                    string="Secondary Unit of Measure"
+                    col="4"
+                    groups="uom.group_uom"
+                >
+                    <field name="secondary_uom_ids" colspan="4" nolabel="1">
                         <tree editable="bottom" decoration-muted="(not active)">
                             <field name="active" widget="boolean_toggle" />
                             <field name="product_tmpl_id" invisible="1" />
@@ -37,7 +43,6 @@
         <field name="name">Product Secondary Unit</field>
         <field name="model">product.product</field>
         <field name="inherit_id" ref="product.product_normal_form_view" />
-        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
         <field name="arch" type="xml">
             <xpath
                 expr="//field[@name='secondary_uom_ids']/tree/field[@name='product_id']"

From 4c20e704e72970ca3b1ade39bdc1ef1ed57af187 Mon Sep 17 00:00:00 2001
From: Adriano Prado <adrianojprado@gmail.com>
Date: Sat, 10 Jun 2023 19:55:02 +0000
Subject: [PATCH 29/58] Added translation using Weblate (Portuguese (Brazil))

---
 product_secondary_unit/i18n/pt_BR.po | 152 +++++++++++++++++++++++++++
 1 file changed, 152 insertions(+)
 create mode 100644 product_secondary_unit/i18n/pt_BR.po

diff --git a/product_secondary_unit/i18n/pt_BR.po b/product_secondary_unit/i18n/pt_BR.po
new file mode 100644
index 00000000000..7707704598d
--- /dev/null
+++ b/product_secondary_unit/i18n/pt_BR.po
@@ -0,0 +1,152 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* product_secondary_unit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2023-06-10 22:13+0000\n"
+"Last-Translator: Adriano Prado <adrianojprado@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__active
+msgid "Active"
+msgstr "Ativo"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__code
+msgid "Code"
+msgstr "Código"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_uid
+msgid "Created by"
+msgstr "Criado por"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_date
+msgid "Created on"
+msgstr "Criado em"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,help:product_secondary_unit.field_product_template__secondary_uom_ids
+msgid "Default Secondary Unit of Measure."
+msgstr "Unidade de medida secundária padrão."
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid "Dependency Type"
+msgstr "Tipo de Dependência"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__dependent
+msgid "Dependent"
+msgstr "Dependente"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
+msgid "Display Name"
+msgstr "Nome de exibição"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
+msgid "ID"
+msgstr "ID"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid ""
+"If dependency type is 'dependent' the factor is used to compute quantity in "
+"primary unit,otherwise primary and secondary unit are independent. For "
+"example if you sell serviceby package (1 unit for example) and you want to "
+"put the real time (ex : 4 hours) to allows employee scheduling"
+msgstr ""
+"Se o tipo de dependência for 'dependente', o fator é usado para calcular a "
+"quantidade na unidade primária, caso contrário, as unidades primária e "
+"secundária são independentes. Por exemplo se você vende serviço por pacote ("
+"1 unidade por exemplo) e quer colocar o tempo real (ex: 4 horas) para "
+"permitir agendamento de funcionários"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__independent
+msgid "Independent"
+msgstr "Independente"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
+msgid "Last Modified on"
+msgstr "Última Modificação em"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
+msgid "Last Updated by"
+msgstr "Última Atualização por"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_date
+msgid "Last Updated on"
+msgstr "Última Atualização em"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__name
+msgid "Name"
+msgstr "Nome"
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_template
+msgid "Product"
+msgstr "Produto"
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
+msgid "Product Secondary Unit"
+msgstr "Unidade Secundária Produto"
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit_mixin
+msgid "Product Secondary Unit Mixin"
+msgstr "Mixin de Unidade Secundária de Produto"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
+msgid "Product Template"
+msgstr "Modelo de produto"
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_product
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_id
+msgid "Product Variant"
+msgstr "Variação Produto"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_id
+msgid "Second unit"
+msgstr "Unidade Secundaria"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_qty
+msgid "Secondary Qty"
+msgstr "Qtd Secundaria"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__factor
+msgid "Secondary Unit Factor"
+msgstr "Fator da Unidade Secundaria"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+msgid "Secondary Unit of Measure"
+msgstr "Unidade de Medida Secundaria"

From 61404ad416d6583fba1fb380399cba0bf8aca4a6 Mon Sep 17 00:00:00 2001
From: Ivorra78 <informatica@totmaterial.es>
Date: Wed, 23 Aug 2023 09:19:35 +0000
Subject: [PATCH 30/58] Translated using Weblate (Spanish)

Currently translated at 100.0% (24 of 24 strings)

Translation: product-attribute-16.0/product-attribute-16.0-product_secondary_unit
Translate-URL: https://translation.odoo-community.org/projects/product-attribute-16-0/product-attribute-16-0-product_secondary_unit/es/
---
 product_secondary_unit/README.rst             | 15 ++++---
 product_secondary_unit/i18n/es.po             | 13 ++++--
 .../static/description/index.html             | 40 ++++++++++---------
 3 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/product_secondary_unit/README.rst b/product_secondary_unit/README.rst
index 236a4420137..dc8694e147b 100644
--- a/product_secondary_unit/README.rst
+++ b/product_secondary_unit/README.rst
@@ -2,10 +2,13 @@
 Product Secondary Unit
 ======================
 
-.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:f87190dec14fd6b01f55e9f9dccaf3054a813ab70c4d78b8b638975b7935adb6
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
     :target: https://odoo-community.org/page/development-status
@@ -19,11 +22,11 @@ Product Secondary Unit
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
     :target: https://translation.odoo-community.org/projects/product-attribute-16-0/product-attribute-16-0-product_secondary_unit
     :alt: Translate me on Weblate
-.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/135/16.0
-    :alt: Try me on Runbot
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/product-attribute&target_branch=16.0
+    :alt: Try me on Runboat
 
-|badge1| |badge2| |badge3| |badge4| |badge5| 
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 This module extends the functionality of product module to allow define other units with their conversion factor.
 
@@ -46,7 +49,7 @@ Bug Tracker
 
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/product-attribute/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
+If you spotted it first, help us to smash it by providing a detailed and welcomed
 `feedback <https://github.com/OCA/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2016.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.
diff --git a/product_secondary_unit/i18n/es.po b/product_secondary_unit/i18n/es.po
index fcceea3e13f..3fa341c3289 100644
--- a/product_secondary_unit/i18n/es.po
+++ b/product_secondary_unit/i18n/es.po
@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-01-11 04:38+0000\n"
-"PO-Revision-Date: 2023-01-11 05:40+0100\n"
-"Last-Translator: Sergio Teruel <sergio.teruel@tecnativa.com>\n"
+"PO-Revision-Date: 2023-08-29 08:30+0000\n"
+"Last-Translator: Ivorra78 <informatica@totmaterial.es>\n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Weblate 4.17\n"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__active
@@ -72,11 +72,16 @@ msgid ""
 "example if you sell serviceby package (1 unit for example) and you want to "
 "put the real time (ex : 4 hours) to allows employee scheduling"
 msgstr ""
+"Si el tipo de dependencia es 'dependiente' el factor se utiliza para "
+"calcular la cantidad en la unidad primaria, de lo contrario la unidad "
+"primaria y secundaria son independientes. Por ejemplo, si vende un servicio "
+"por paquete (1 unidad, por ejemplo) y desea poner el tiempo real (por "
+"ejemplo, 4 horas) para permitir la programación de los empleados"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__independent
 msgid "Independent"
-msgstr ""
+msgstr "Independiente"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
diff --git a/product_secondary_unit/static/description/index.html b/product_secondary_unit/static/description/index.html
index 4df7c2cf97a..a0a412def4b 100644
--- a/product_secondary_unit/static/description/index.html
+++ b/product_secondary_unit/static/description/index.html
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
 <title>Product Secondary Unit</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
 
-See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
 */
 
@@ -366,24 +366,26 @@ <h1 class="title">Product Secondary Unit</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:f87190dec14fd6b01f55e9f9dccaf3054a813ab70c4d78b8b638975b7935adb6
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" 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" href="https://github.com/OCA/product-attribute/tree/16.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/product-attribute-16-0/product-attribute-16-0-product_secondary_unit"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/135/16.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.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/product-attribute/tree/16.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/product-attribute-16-0/product-attribute-16-0-product_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/product-attribute&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 product module to allow define other units with their conversion factor.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#usage" id="id1">Usage</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="id2">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id3">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id4">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
+<li><a class="reference internal" href="#usage" id="toc-entry-1">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-2">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-3">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-4">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-5">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-6">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="section" id="usage">
-<h1><a class="toc-backref" href="#id1">Usage</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
 <p>To use this module you need to:</p>
 <ol class="arabic simple">
 <li>Go to a <em>Product &gt; General Information tab</em>.</li>
@@ -392,23 +394,23 @@ <h1><a class="toc-backref" href="#id1">Usage</a></h1>
 </ol>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
+<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/product-attribute/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 smashing it by providing a detailed and welcomed
+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/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2016.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">
-<h1><a class="toc-backref" href="#id3">Credits</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#id4">Authors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
 <ul class="simple">
 <li>Tecnativa</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <ul class="simple">
 <li>Carlos Dauden &lt;<a class="reference external" href="mailto:carlos.dauden&#64;tecnativa.com">carlos.dauden&#64;tecnativa.com</a>&gt;</li>
 <li>Sergio Teruel &lt;<a class="reference external" href="mailto:sergio.teruel&#64;tecnativa.com">sergio.teruel&#64;tecnativa.com</a>&gt;</li>
@@ -418,14 +420,14 @@ <h2><a class="toc-backref" href="#id5">Contributors</a></h2>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
+<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>
 <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>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
-<p><a class="reference external" href="https://github.com/sergio-teruel"><img alt="sergio-teruel" src="https://github.com/sergio-teruel.png?size=40px" /></a></p>
+<p><a class="reference external image-reference" href="https://github.com/sergio-teruel"><img alt="sergio-teruel" src="https://github.com/sergio-teruel.png?size=40px" /></a></p>
 <p>This module is part of the <a class="reference external" href="https://github.com/OCA/product-attribute/tree/16.0/product_secondary_unit">OCA/product-attribute</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>

From ff38b8d29d3e72105f395ad720236fb07fd810af Mon Sep 17 00:00:00 2001
From: sergio-teruel <sergio.teruel@tecnativa.com>
Date: Wed, 13 Sep 2023 11:14:42 +0200
Subject: [PATCH 31/58] [FIX] product_secondary_unit: wrong factor computation
 for uom's equal between secondary uom and product uom

---
 product_secondary_unit/README.rst                         | 2 +-
 product_secondary_unit/__manifest__.py                    | 2 +-
 .../models/product_secondary_unit_mixin.py                | 8 +++++++-
 product_secondary_unit/static/description/index.html      | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/product_secondary_unit/README.rst b/product_secondary_unit/README.rst
index dc8694e147b..4f2392f8a53 100644
--- a/product_secondary_unit/README.rst
+++ b/product_secondary_unit/README.rst
@@ -7,7 +7,7 @@ Product Secondary Unit
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:f87190dec14fd6b01f55e9f9dccaf3054a813ab70c4d78b8b638975b7935adb6
+   !! source digest: sha256:95919dbd555eed56a07a11a179356660ef02d6df54df3a9e0752c0f983c44653
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index 2e4dbc1adca..b3a09d58843 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Product Secondary Unit",
     "summary": "Set a secondary unit per product",
-    "version": "16.0.1.0.0",
+    "version": "16.0.1.0.1",
     "development_status": "Production/Stable",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
diff --git a/product_secondary_unit/models/product_secondary_unit_mixin.py b/product_secondary_unit/models/product_secondary_unit_mixin.py
index e2feac544d3..aebfc614211 100644
--- a/product_secondary_unit/models/product_secondary_unit_mixin.py
+++ b/product_secondary_unit/models/product_secondary_unit_mixin.py
@@ -31,6 +31,7 @@ class ProductSecondaryUnitMixin(models.AbstractModel):
     _name = "product.secondary.unit.mixin"
     _description = "Product Secondary Unit Mixin"
     _secondary_unit_fields = {}
+    _product_uom_field = "uom_id"
 
     @api.model
     def _get_default_secondary_uom(self):
@@ -54,7 +55,12 @@ def _get_uom_line(self):
         return self[self._secondary_unit_fields["uom_field"]]
 
     def _get_factor_line(self):
-        return self.secondary_uom_id.factor * self._get_uom_line().factor
+        uom_line = self._get_uom_line()
+        return self.secondary_uom_id.factor * (
+            uom_line.factor
+            if self.product_id[self._product_uom_field] != uom_line
+            else 1.0
+        )
 
     def _get_quantity_from_line(self):
         return self[self._secondary_unit_fields["qty_field"]]
diff --git a/product_secondary_unit/static/description/index.html b/product_secondary_unit/static/description/index.html
index a0a412def4b..f5ae2f5ecb3 100644
--- a/product_secondary_unit/static/description/index.html
+++ b/product_secondary_unit/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Product Secondary Unit</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:f87190dec14fd6b01f55e9f9dccaf3054a813ab70c4d78b8b638975b7935adb6
+!! source digest: sha256:95919dbd555eed56a07a11a179356660ef02d6df54df3a9e0752c0f983c44653
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.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/product-attribute/tree/16.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/product-attribute-16-0/product-attribute-16-0-product_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/product-attribute&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 product module to allow define other units with their conversion factor.</p>

From 8cf7a6b5042e4fd0deb7a98b57b6a28a0933e4df Mon Sep 17 00:00:00 2001
From: Carlos Serra-Toro <carlos.serra@braintec.com>
Date: Thu, 28 Sep 2023 12:50:36 +0200
Subject: [PATCH 32/58] [16.0][FIX] product_secondary_unit: precompute
 secondary_uom_qty

The field `secondary_uom_qty` is defined in the mixin class
`product.secondary.unit.mixin` as being computed, but without
precomputation. This makes that when this field is used in
the variable `_secondary_unit_fields` for classes using the
mixing, it ends up as a dependency of other fields that are
computed and do require precomputation. But, not being the
field `secondary_uom_qty` precomputed, it disables the
precomputation of those other fields.

This has an impact when installing the module `sale` along
with the module `product_secondary_unit`, which causes the
module `sale_order_secondary_unit` to be auto-installed. As
a result, the following errors appear in the log, disabling
the precomputation of 11 other fields:

```text
/opt/project/repos/odoo/odoo/fields.py:802: UserWarning: Field sale.order.line.product_uom_qty cannot be precomputed as it depends on non-precomputed field sale.order.line.secondary_uom_qty
/opt/project/repos/odoo/odoo/fields.py:802: UserWarning: Field sale.order.line.price_unit cannot be precomputed as it depends on non-precomputed field sale.order.line.product_uom_qty
/opt/project/repos/odoo/odoo/fields.py:802: UserWarning: Field sale.order.line.discount cannot be precomputed as it depends on non-precomputed field sale.order.line.product_uom_qty
/opt/project/repos/odoo/odoo/fields.py:802: UserWarning: Field sale.order.line.price_reduce cannot be precomputed as it depends on non-precomputed field sale.order.line.price_unit
/opt/project/repos/odoo/odoo/fields.py:802: UserWarning: Field sale.order.line.price_subtotal cannot be precomputed as it depends on non-precomputed field sale.order.line.product_uom_qty
/opt/project/repos/odoo/odoo/fields.py:802: UserWarning: Field sale.order.line.price_tax cannot be precomputed as it depends on non-precomputed field sale.order.line.product_uom_qty
/opt/project/repos/odoo/odoo/fields.py:802: UserWarning: Field sale.order.line.price_total cannot be precomputed as it depends on non-precomputed field sale.order.line.product_uom_qty
/opt/project/repos/odoo/odoo/fields.py:802: UserWarning: Field sale.order.line.price_reduce_taxexcl cannot be precomputed as it depends on non-precomputed field sale.order.line.price_subtotal
/opt/project/repos/odoo/odoo/fields.py:802: UserWarning: Field sale.order.line.price_reduce_taxinc cannot be precomputed as it depends on non-precomputed field sale.order.line.price_total
/opt/project/repos/odoo/odoo/fields.py:802: UserWarning: Field sale.order.line.product_packaging_id cannot be precomputed as it depends on non-precomputed field sale.order.line.product_uom_qty
/opt/project/repos/odoo/odoo/fields.py:802: UserWarning: Field sale.order.line.product_packaging_qty cannot be precomputed as it depends on non-precomputed field sale.order.line.product_packaging_id
```

Making `secondary_uom_qty` precomputed solves these warnings.
---
 product_secondary_unit/README.rst                             | 2 +-
 product_secondary_unit/__manifest__.py                        | 2 +-
 product_secondary_unit/i18n/pt_BR.po                          | 4 ++--
 product_secondary_unit/models/product_secondary_unit_mixin.py | 1 +
 product_secondary_unit/static/description/index.html          | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/product_secondary_unit/README.rst b/product_secondary_unit/README.rst
index 4f2392f8a53..0c67409d4cf 100644
--- a/product_secondary_unit/README.rst
+++ b/product_secondary_unit/README.rst
@@ -7,7 +7,7 @@ Product Secondary Unit
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:95919dbd555eed56a07a11a179356660ef02d6df54df3a9e0752c0f983c44653
+   !! source digest: sha256:d65a89ea029f38f13170b2bda707e4c4300b38ce287b459518bef3fe10bd9fd1
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index b3a09d58843..82ccc5578fa 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Product Secondary Unit",
     "summary": "Set a secondary unit per product",
-    "version": "16.0.1.0.1",
+    "version": "16.0.1.0.2",
     "development_status": "Production/Stable",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
diff --git a/product_secondary_unit/i18n/pt_BR.po b/product_secondary_unit/i18n/pt_BR.po
index 7707704598d..46133260894 100644
--- a/product_secondary_unit/i18n/pt_BR.po
+++ b/product_secondary_unit/i18n/pt_BR.po
@@ -73,8 +73,8 @@ msgid ""
 msgstr ""
 "Se o tipo de dependência for 'dependente', o fator é usado para calcular a "
 "quantidade na unidade primária, caso contrário, as unidades primária e "
-"secundária são independentes. Por exemplo se você vende serviço por pacote ("
-"1 unidade por exemplo) e quer colocar o tempo real (ex: 4 horas) para "
+"secundária são independentes. Por exemplo se você vende serviço por pacote "
+"(1 unidade por exemplo) e quer colocar o tempo real (ex: 4 horas) para "
 "permitir agendamento de funcionários"
 
 #. module: product_secondary_unit
diff --git a/product_secondary_unit/models/product_secondary_unit_mixin.py b/product_secondary_unit/models/product_secondary_unit_mixin.py
index aebfc614211..9360165a0dc 100644
--- a/product_secondary_unit/models/product_secondary_unit_mixin.py
+++ b/product_secondary_unit/models/product_secondary_unit_mixin.py
@@ -43,6 +43,7 @@ def _get_default_secondary_uom(self):
         store=True,
         readonly=False,
         compute="_compute_secondary_uom_qty",
+        precompute=True,
     )
     secondary_uom_id = fields.Many2one(
         comodel_name="product.secondary.unit",
diff --git a/product_secondary_unit/static/description/index.html b/product_secondary_unit/static/description/index.html
index f5ae2f5ecb3..70c6516b338 100644
--- a/product_secondary_unit/static/description/index.html
+++ b/product_secondary_unit/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Product Secondary Unit</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:95919dbd555eed56a07a11a179356660ef02d6df54df3a9e0752c0f983c44653
+!! source digest: sha256:d65a89ea029f38f13170b2bda707e4c4300b38ce287b459518bef3fe10bd9fd1
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.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/product-attribute/tree/16.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/product-attribute-16-0/product-attribute-16-0-product_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/product-attribute&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 product module to allow define other units with their conversion factor.</p>

From eb282f9dd53f86161d697df9318a6a33820bc956 Mon Sep 17 00:00:00 2001
From: mymage <stefano.consolaro@mymage.it>
Date: Sun, 29 Oct 2023 11:23:59 +0000
Subject: [PATCH 33/58] Added translation using Weblate (Italian)

---
 product_secondary_unit/i18n/it.po | 152 ++++++++++++++++++++++++++++++
 1 file changed, 152 insertions(+)
 create mode 100644 product_secondary_unit/i18n/it.po

diff --git a/product_secondary_unit/i18n/it.po b/product_secondary_unit/i18n/it.po
new file mode 100644
index 00000000000..87736cd27f3
--- /dev/null
+++ b/product_secondary_unit/i18n/it.po
@@ -0,0 +1,152 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* product_secondary_unit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2023-10-31 12:16+0000\n"
+"Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__active
+msgid "Active"
+msgstr "Attiva"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__code
+msgid "Code"
+msgstr "Codice"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_uid
+msgid "Created by"
+msgstr "Creato da"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_date
+msgid "Created on"
+msgstr "Creato il"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,help:product_secondary_unit.field_product_template__secondary_uom_ids
+msgid "Default Secondary Unit of Measure."
+msgstr "Unità di misura secondaria predefinita."
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid "Dependency Type"
+msgstr "Tipo dipendenza"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__dependent
+msgid "Dependent"
+msgstr "Dipendente"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
+msgid "Display Name"
+msgstr "Nome visualizzato"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
+msgid "ID"
+msgstr "ID"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid ""
+"If dependency type is 'dependent' the factor is used to compute quantity in "
+"primary unit,otherwise primary and secondary unit are independent. For "
+"example if you sell serviceby package (1 unit for example) and you want to "
+"put the real time (ex : 4 hours) to allows employee scheduling"
+msgstr ""
+"Se il tipo dipendenza è 'dipendente' il fattore è utilizzato per calcolare "
+"la quantità nell'unità principale, altrimenti l'unità principale e "
+"secondaria sono indipendenti. Per esempio se si vende un servizio per collo ("
+"una unità per esempio) e si vuole inserire il tempo reale (es.: 4 ore) per "
+"consentire la schedulazione dipendente"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__independent
+msgid "Independent"
+msgstr "Indipendente"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
+msgid "Last Modified on"
+msgstr "Ultima modifica il"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
+msgid "Last Updated by"
+msgstr "Ultimo aggiornamento di"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_date
+msgid "Last Updated on"
+msgstr "Ultimo aggiornamento il"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__name
+msgid "Name"
+msgstr "Nome"
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_template
+msgid "Product"
+msgstr "Prodotto"
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
+msgid "Product Secondary Unit"
+msgstr "Unità di misura secondaria del prodotto"
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit_mixin
+msgid "Product Secondary Unit Mixin"
+msgstr "Mixin unità di misura secondaria del prodotto"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
+msgid "Product Template"
+msgstr "Modello prodotto"
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_product
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_id
+msgid "Product Variant"
+msgstr "Variante prodotto"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_id
+msgid "Second unit"
+msgstr "Unità secondaria"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_qty
+msgid "Secondary Qty"
+msgstr "Q.tà secondaria"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__factor
+msgid "Secondary Unit Factor"
+msgstr "Fattore unità secondaria"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+msgid "Secondary Unit of Measure"
+msgstr "Unità di misura secondaria"

From 1e217fcc6c4dba2839c138ffc54ee19f5c0c2aae Mon Sep 17 00:00:00 2001
From: Alexey Pelykh <alexey.pelykh@gmail.com>
Date: Sun, 17 Mar 2024 09:36:24 +0100
Subject: [PATCH 34/58] [FIX] product_secondary_unit: use existing value

---
 product_secondary_unit/models/product_secondary_unit_mixin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/product_secondary_unit/models/product_secondary_unit_mixin.py b/product_secondary_unit/models/product_secondary_unit_mixin.py
index 9360165a0dc..527f187da21 100644
--- a/product_secondary_unit/models/product_secondary_unit_mixin.py
+++ b/product_secondary_unit/models/product_secondary_unit_mixin.py
@@ -99,7 +99,7 @@ def _compute_helper_target_field_qty(self):
         for rec in self:
             if not rec.secondary_uom_id:
                 rec[rec._secondary_unit_fields["qty_field"]] = (
-                    rec._origin[rec._secondary_unit_fields["qty_field"]]
+                    rec[rec._secondary_unit_fields["qty_field"]]
                     or default_qty_field_value
                 )
                 continue

From fe0be3e8dd60aa07e1c561c7a3789c00eecf135a Mon Sep 17 00:00:00 2001
From: Alexey Pelykh <alexey.pelykh@gmail.com>
Date: Wed, 20 Mar 2024 19:18:21 +0100
Subject: [PATCH 35/58] [IMP] product_secondary_unit: pre-commit auto fixes

---
 product_secondary_unit/README.rst             | 35 ++++++++++---------
 .../models/product_second_unit.py             |  4 +--
 product_secondary_unit/pyproject.toml         |  3 ++
 product_secondary_unit/readme/CONTRIBUTORS.md |  5 +++
 .../readme/CONTRIBUTORS.rst                   |  5 ---
 .../{DESCRIPTION.rst => DESCRIPTION.md}       |  3 +-
 product_secondary_unit/readme/USAGE.md        |  5 +++
 product_secondary_unit/readme/USAGE.rst       |  5 ---
 .../static/description/index.html             |  9 ++---
 9 files changed, 39 insertions(+), 35 deletions(-)
 create mode 100644 product_secondary_unit/pyproject.toml
 create mode 100644 product_secondary_unit/readme/CONTRIBUTORS.md
 delete mode 100644 product_secondary_unit/readme/CONTRIBUTORS.rst
 rename product_secondary_unit/readme/{DESCRIPTION.rst => DESCRIPTION.md} (56%)
 create mode 100644 product_secondary_unit/readme/USAGE.md
 delete mode 100644 product_secondary_unit/readme/USAGE.rst

diff --git a/product_secondary_unit/README.rst b/product_secondary_unit/README.rst
index 0c67409d4cf..56149f539fb 100644
--- a/product_secondary_unit/README.rst
+++ b/product_secondary_unit/README.rst
@@ -17,18 +17,19 @@ Product 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%2Fproduct--attribute-lightgray.png?logo=github
-    :target: https://github.com/OCA/product-attribute/tree/16.0/product_secondary_unit
+    :target: https://github.com/OCA/product-attribute/tree/17.0/product_secondary_unit
     :alt: OCA/product-attribute
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/product-attribute-16-0/product-attribute-16-0-product_secondary_unit
+    :target: https://translation.odoo-community.org/projects/product-attribute-17-0/product-attribute-17-0-product_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/product-attribute&target_branch=16.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/product-attribute&target_branch=17.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
 
-This module extends the functionality of product module to allow define other units with their conversion factor.
+This module extends the functionality of product module to allow define
+other units with their conversion factor.
 
 **Table of contents**
 
@@ -40,9 +41,9 @@ 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.
+1. Go to a *Product > General Information tab*.
+2. Create any record in "Secondary unit of measure".
+3. Set the conversion factor.
 
 Bug Tracker
 ===========
@@ -50,7 +51,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/product-attribute/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/product-attribute/issues/new?body=module:%20product_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/product-attribute/issues/new?body=module:%20product_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.
 
@@ -58,21 +59,21 @@ Credits
 =======
 
 Authors
-~~~~~~~
+-------
 
 * Tecnativa
 
 Contributors
-~~~~~~~~~~~~
+------------
 
-* Carlos Dauden <carlos.dauden@tecnativa.com>
-* Sergio Teruel <sergio.teruel@tecnativa.com>
-* Kitti Upariphutthiphong <kittiu@ecosoft.co.th>
-* Pimolnat Suntian <pimolnats@ecosoft.co.th>
-* Alan Ramos <alan.ramos@jarsa.com.mx>
+-  Carlos Dauden <carlos.dauden@tecnativa.com>
+-  Sergio Teruel <sergio.teruel@tecnativa.com>
+-  Kitti Upariphutthiphong <kittiu@ecosoft.co.th>
+-  Pimolnat Suntian <pimolnats@ecosoft.co.th>
+-  Alan Ramos <alan.ramos@jarsa.com.mx>
 
 Maintainers
-~~~~~~~~~~~
+-----------
 
 This module is maintained by the OCA.
 
@@ -92,6 +93,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-sergio-teruel| 
 
-This module is part of the `OCA/product-attribute <https://github.com/OCA/product-attribute/tree/16.0/product_secondary_unit>`_ project on GitHub.
+This module is part of the `OCA/product-attribute <https://github.com/OCA/product-attribute/tree/17.0/product_secondary_unit>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/product_secondary_unit/models/product_second_unit.py b/product_secondary_unit/models/product_second_unit.py
index 47a758b7dc5..1b4f552ac31 100644
--- a/product_secondary_unit/models/product_second_unit.py
+++ b/product_secondary_unit/models/product_second_unit.py
@@ -48,9 +48,7 @@ def name_get(self):
             result.append(
                 (
                     unit.id,
-                    "{unit_name}-{factor}".format(
-                        unit_name=unit.name, factor=unit.factor
-                    ),
+                    f"{unit.name}-{unit.factor}",
                 )
             )
         return result
diff --git a/product_secondary_unit/pyproject.toml b/product_secondary_unit/pyproject.toml
new file mode 100644
index 00000000000..4231d0cccb3
--- /dev/null
+++ b/product_secondary_unit/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/product_secondary_unit/readme/CONTRIBUTORS.md b/product_secondary_unit/readme/CONTRIBUTORS.md
new file mode 100644
index 00000000000..b9e4cd3c0b9
--- /dev/null
+++ b/product_secondary_unit/readme/CONTRIBUTORS.md
@@ -0,0 +1,5 @@
+- Carlos Dauden \<<carlos.dauden@tecnativa.com>\>
+- Sergio Teruel \<<sergio.teruel@tecnativa.com>\>
+- Kitti Upariphutthiphong \<<kittiu@ecosoft.co.th>\>
+- Pimolnat Suntian \<<pimolnats@ecosoft.co.th>\>
+- Alan Ramos \<<alan.ramos@jarsa.com.mx>\>
diff --git a/product_secondary_unit/readme/CONTRIBUTORS.rst b/product_secondary_unit/readme/CONTRIBUTORS.rst
deleted file mode 100644
index 7b075b8a691..00000000000
--- a/product_secondary_unit/readme/CONTRIBUTORS.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-* Carlos Dauden <carlos.dauden@tecnativa.com>
-* Sergio Teruel <sergio.teruel@tecnativa.com>
-* Kitti Upariphutthiphong <kittiu@ecosoft.co.th>
-* Pimolnat Suntian <pimolnats@ecosoft.co.th>
-* Alan Ramos <alan.ramos@jarsa.com.mx>
diff --git a/product_secondary_unit/readme/DESCRIPTION.rst b/product_secondary_unit/readme/DESCRIPTION.md
similarity index 56%
rename from product_secondary_unit/readme/DESCRIPTION.rst
rename to product_secondary_unit/readme/DESCRIPTION.md
index 1b02bbb452e..006bd6d63a2 100644
--- a/product_secondary_unit/readme/DESCRIPTION.rst
+++ b/product_secondary_unit/readme/DESCRIPTION.md
@@ -1 +1,2 @@
-This module extends the functionality of product module to allow define other units with their conversion factor.
+This module extends the functionality of product module to allow define
+other units with their conversion factor.
diff --git a/product_secondary_unit/readme/USAGE.md b/product_secondary_unit/readme/USAGE.md
new file mode 100644
index 00000000000..2411df3cdcb
--- /dev/null
+++ b/product_secondary_unit/readme/USAGE.md
@@ -0,0 +1,5 @@
+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.
diff --git a/product_secondary_unit/readme/USAGE.rst b/product_secondary_unit/readme/USAGE.rst
deleted file mode 100644
index 3f837c39383..00000000000
--- a/product_secondary_unit/readme/USAGE.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-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.
diff --git a/product_secondary_unit/static/description/index.html b/product_secondary_unit/static/description/index.html
index 70c6516b338..278505906fa 100644
--- a/product_secondary_unit/static/description/index.html
+++ b/product_secondary_unit/static/description/index.html
@@ -369,8 +369,9 @@ <h1 class="title">Product Secondary Unit</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:d65a89ea029f38f13170b2bda707e4c4300b38ce287b459518bef3fe10bd9fd1
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.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/product-attribute/tree/16.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/product-attribute-16-0/product-attribute-16-0-product_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/product-attribute&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 product module to allow define other units with their conversion factor.</p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.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/product-attribute/tree/17.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/product-attribute-17-0/product-attribute-17-0-product_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/product-attribute&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 product module to allow define
+other units with their conversion factor.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -398,7 +399,7 @@ <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/product-attribute/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/product-attribute/issues/new?body=module:%20product_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/product-attribute/issues/new?body=module:%20product_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">
@@ -428,7 +429,7 @@ <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external image-reference" href="https://github.com/sergio-teruel"><img alt="sergio-teruel" src="https://github.com/sergio-teruel.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/product-attribute/tree/16.0/product_secondary_unit">OCA/product-attribute</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/product-attribute/tree/17.0/product_secondary_unit">OCA/product-attribute</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>

From bd557353a69faac3d828b2b1fc4923a0357822e5 Mon Sep 17 00:00:00 2001
From: achulii <96129046+achulii@users.noreply.github.com>
Date: Fri, 1 Mar 2024 21:28:22 +0100
Subject: [PATCH 36/58] [MIG] product_secondary_unit: Migration to 17.0

---
 product_secondary_unit/README.rst                  |  2 +-
 product_secondary_unit/__manifest__.py             |  2 +-
 product_secondary_unit/i18n/es.po                  |  8 +++-----
 product_secondary_unit/i18n/es_MX.po               |  8 +++-----
 product_secondary_unit/i18n/fr.po                  |  8 +++-----
 product_secondary_unit/i18n/it.po                  | 12 +++++-------
 .../i18n/product_secondary_unit.pot                |  7 +------
 product_secondary_unit/i18n/pt_BR.po               |  8 +++-----
 product_secondary_unit/i18n/zh_CN.po               |  8 +++-----
 product_secondary_unit/models/product_product.py   |  4 ++--
 .../models/product_second_unit.py                  |  2 +-
 .../static/description/index.html                  | 14 ++++++++------
 product_secondary_unit/tests/models.py             |  2 +-
 .../tests/test_secondary_unit_mixin.py             |  4 ++--
 product_secondary_unit/views/product_views.xml     |  4 ++--
 15 files changed, 39 insertions(+), 54 deletions(-)

diff --git a/product_secondary_unit/README.rst b/product_secondary_unit/README.rst
index 56149f539fb..3dd6c662a35 100644
--- a/product_secondary_unit/README.rst
+++ b/product_secondary_unit/README.rst
@@ -7,7 +7,7 @@ Product Secondary Unit
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:d65a89ea029f38f13170b2bda707e4c4300b38ce287b459518bef3fe10bd9fd1
+   !! source digest: sha256:3038be23ebd37dd87f7595ccf86308fa611b0a81df5134e31c81d12bb79f3f84
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index 82ccc5578fa..19ca23ff380 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Product Secondary Unit",
     "summary": "Set a secondary unit per product",
-    "version": "16.0.1.0.2",
+    "version": "17.0.1.0.0",
     "development_status": "Production/Stable",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
diff --git a/product_secondary_unit/i18n/es.po b/product_secondary_unit/i18n/es.po
index 3fa341c3289..3e8f12bb587 100644
--- a/product_secondary_unit/i18n/es.po
+++ b/product_secondary_unit/i18n/es.po
@@ -83,11 +83,6 @@ msgstr ""
 msgid "Independent"
 msgstr "Independiente"
 
-#. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
-msgid "Last Modified on"
-msgstr "Última modificación en"
-
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
 msgid "Last Updated by"
@@ -152,6 +147,9 @@ msgstr "Factor segunda unidad"
 msgid "Secondary Unit of Measure"
 msgstr "Segunda unidad de medida"
 
+#~ msgid "Last Modified on"
+#~ msgstr "Última modificación en"
+
 #~ msgid "secondary Unit"
 #~ msgstr "Unidad Secundaria"
 
diff --git a/product_secondary_unit/i18n/es_MX.po b/product_secondary_unit/i18n/es_MX.po
index e5ac58543d8..d9dfb78a3f4 100644
--- a/product_secondary_unit/i18n/es_MX.po
+++ b/product_secondary_unit/i18n/es_MX.po
@@ -77,11 +77,6 @@ msgstr ""
 msgid "Independent"
 msgstr ""
 
-#. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
-msgid "Last Modified on"
-msgstr "Última Actualización en"
-
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
 msgid "Last Updated by"
@@ -146,6 +141,9 @@ msgstr "Factor de Unidad Secundaria"
 msgid "Secondary Unit of Measure"
 msgstr "Unidad de Medida Secundaria"
 
+#~ msgid "Last Modified on"
+#~ msgstr "Última Actualización en"
+
 #~ msgid "secondary Unit"
 #~ msgstr "Unidad Secundaria"
 
diff --git a/product_secondary_unit/i18n/fr.po b/product_secondary_unit/i18n/fr.po
index 90d52b7b181..1ab1aef2ab6 100644
--- a/product_secondary_unit/i18n/fr.po
+++ b/product_secondary_unit/i18n/fr.po
@@ -77,11 +77,6 @@ msgstr ""
 msgid "Independent"
 msgstr ""
 
-#. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
-msgid "Last Modified on"
-msgstr "Dernière Modification le"
-
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
 msgid "Last Updated by"
@@ -146,6 +141,9 @@ msgstr "Facteur de l'unité secondaire"
 msgid "Secondary Unit of Measure"
 msgstr "Unité de mesure secondaire"
 
+#~ msgid "Last Modified on"
+#~ msgstr "Dernière Modification le"
+
 #~ msgid "secondary Unit"
 #~ msgstr "Unité secondaire"
 
diff --git a/product_secondary_unit/i18n/it.po b/product_secondary_unit/i18n/it.po
index 87736cd27f3..ab04aab821a 100644
--- a/product_secondary_unit/i18n/it.po
+++ b/product_secondary_unit/i18n/it.po
@@ -73,8 +73,8 @@ msgid ""
 msgstr ""
 "Se il tipo dipendenza è 'dipendente' il fattore è utilizzato per calcolare "
 "la quantità nell'unità principale, altrimenti l'unità principale e "
-"secondaria sono indipendenti. Per esempio se si vende un servizio per collo ("
-"una unità per esempio) e si vuole inserire il tempo reale (es.: 4 ore) per "
+"secondaria sono indipendenti. Per esempio se si vende un servizio per collo "
+"(una unità per esempio) e si vuole inserire il tempo reale (es.: 4 ore) per "
 "consentire la schedulazione dipendente"
 
 #. module: product_secondary_unit
@@ -82,11 +82,6 @@ msgstr ""
 msgid "Independent"
 msgstr "Indipendente"
 
-#. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
-msgid "Last Modified on"
-msgstr "Ultima modifica il"
-
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
 msgid "Last Updated by"
@@ -150,3 +145,6 @@ msgstr "Fattore unità secondaria"
 #: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
 msgid "Secondary Unit of Measure"
 msgstr "Unità di misura secondaria"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Ultima modifica il"
diff --git a/product_secondary_unit/i18n/product_secondary_unit.pot b/product_secondary_unit/i18n/product_secondary_unit.pot
index ef677d11cf8..40aa3eda3b5 100644
--- a/product_secondary_unit/i18n/product_secondary_unit.pot
+++ b/product_secondary_unit/i18n/product_secondary_unit.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 16.0\n"
+"Project-Id-Version: Odoo Server 17.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -74,11 +74,6 @@ msgstr ""
 msgid "Independent"
 msgstr ""
 
-#. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
-msgid "Last Modified on"
-msgstr ""
-
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
 msgid "Last Updated by"
diff --git a/product_secondary_unit/i18n/pt_BR.po b/product_secondary_unit/i18n/pt_BR.po
index 46133260894..408fe382a52 100644
--- a/product_secondary_unit/i18n/pt_BR.po
+++ b/product_secondary_unit/i18n/pt_BR.po
@@ -82,11 +82,6 @@ msgstr ""
 msgid "Independent"
 msgstr "Independente"
 
-#. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
-msgid "Last Modified on"
-msgstr "Última Modificação em"
-
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
 msgid "Last Updated by"
@@ -150,3 +145,6 @@ msgstr "Fator da Unidade Secundaria"
 #: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
 msgid "Secondary Unit of Measure"
 msgstr "Unidade de Medida Secundaria"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Última Modificação em"
diff --git a/product_secondary_unit/i18n/zh_CN.po b/product_secondary_unit/i18n/zh_CN.po
index be5d3ab07c8..499191a853e 100644
--- a/product_secondary_unit/i18n/zh_CN.po
+++ b/product_secondary_unit/i18n/zh_CN.po
@@ -77,11 +77,6 @@ msgstr ""
 msgid "Independent"
 msgstr ""
 
-#. module: product_secondary_unit
-#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit____last_update
-msgid "Last Modified on"
-msgstr "最后修改于"
-
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
 msgid "Last Updated by"
@@ -146,6 +141,9 @@ msgstr "转换率"
 msgid "Secondary Unit of Measure"
 msgstr "辅助计量单位"
 
+#~ msgid "Last Modified on"
+#~ msgstr "最后修改于"
+
 #~ msgid "secondary Unit"
 #~ msgstr "辅助计量单位"
 
diff --git a/product_secondary_unit/models/product_product.py b/product_secondary_unit/models/product_product.py
index 5e6e67d55db..09bf59ac0b2 100644
--- a/product_secondary_unit/models/product_product.py
+++ b/product_secondary_unit/models/product_product.py
@@ -21,7 +21,7 @@ def _compute_secondary_uom_ids(self):
         for variant in self:
             variant.secondary_uom_ids = (
                 variant.product_tmpl_id.secondary_uom_ids.filtered(
-                    lambda s: s.product_id == variant or not s.product_id
+                    lambda s, v=variant: s.product_id == v or not s.product_id
                 )
             )
 
@@ -29,7 +29,7 @@ def _inverse_secondary_uom_ids(self):
         for variant in self:
             variant.product_tmpl_id.secondary_uom_ids = (
                 variant.product_tmpl_id.secondary_uom_ids.filtered(
-                    lambda s: s.product_id != variant
+                    lambda s, v=variant: s.product_id != v
                 )
                 + variant.secondary_uom_ids
             )
diff --git a/product_secondary_unit/models/product_second_unit.py b/product_secondary_unit/models/product_second_unit.py
index 1b4f552ac31..5e554e26ce7 100644
--- a/product_secondary_unit/models/product_second_unit.py
+++ b/product_secondary_unit/models/product_second_unit.py
@@ -59,7 +59,7 @@ def name_search(self, name="", args=None, operator="ilike", limit=100):
             args = []
         units = self.search([("code", "=", name)] + args, limit=1)
         if not units:
-            return super(ProductSecondaryUnit, self).name_search(
+            return super().name_search(
                 name=name, args=args, operator=operator, limit=limit
             )
         return units.name_get()
diff --git a/product_secondary_unit/static/description/index.html b/product_secondary_unit/static/description/index.html
index 278505906fa..c64a2eeec3d 100644
--- a/product_secondary_unit/static/description/index.html
+++ b/product_secondary_unit/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -9,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.
@@ -275,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 }
@@ -301,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -367,7 +367,7 @@ <h1 class="title">Product Secondary Unit</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:d65a89ea029f38f13170b2bda707e4c4300b38ce287b459518bef3fe10bd9fd1
+!! source digest: sha256:3038be23ebd37dd87f7595ccf86308fa611b0a81df5134e31c81d12bb79f3f84
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.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/product-attribute/tree/17.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/product-attribute-17-0/product-attribute-17-0-product_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/product-attribute&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 product module to allow define
@@ -423,7 +423,9 @@ <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>
diff --git a/product_secondary_unit/tests/models.py b/product_secondary_unit/tests/models.py
index c801b407394..8880e5ec531 100644
--- a/product_secondary_unit/tests/models.py
+++ b/product_secondary_unit/tests/models.py
@@ -15,7 +15,7 @@ class SecondaryUnitFake(models.Model):
     name = fields.Char()
     product_id = fields.Many2one("product.product", "Product", readonly=True)
     product_uom_qty = fields.Float(
-        store=True, readonly=False, compute="_compute_product_uom_qty"
+        store=True, readonly=False, compute="_compute_product_uom_qty", precompute=True
     )
     product_uom_id = fields.Many2one("uom.uom", string="Product Unit of Measure")
 
diff --git a/product_secondary_unit/tests/test_secondary_unit_mixin.py b/product_secondary_unit/tests/test_secondary_unit_mixin.py
index e0ff1b4dcdd..df27d26ad54 100644
--- a/product_secondary_unit/tests/test_secondary_unit_mixin.py
+++ b/product_secondary_unit/tests/test_secondary_unit_mixin.py
@@ -60,7 +60,7 @@ def setUpClass(cls):
     @classmethod
     def tearDownClass(cls):
         cls.loader.restore_registry()
-        return super(TestProductSecondaryUnitMixin, cls).tearDownClass()
+        return super().tearDownClass()
 
     def test_product_secondary_unit_mixin(self):
         fake_model = self.secondary_unit_fake
@@ -82,7 +82,7 @@ def test_product_secondary_unit_mixin(self):
         fake_model.write(
             {"secondary_uom_qty": 1, "secondary_uom_id": self.secondary_unit_box_10.id}
         )
-        fake_model.flush()
+        fake_model.invalidate_recordset()
         fake_model.product_uom_id = self.product_uom_dozen
         fake_model._onchange_helper_product_uom_for_secondary()
         self.assertEqual(fake_model.secondary_uom_qty, 12)
diff --git a/product_secondary_unit/views/product_views.xml b/product_secondary_unit/views/product_views.xml
index 4c628165624..a24666be776 100644
--- a/product_secondary_unit/views/product_views.xml
+++ b/product_secondary_unit/views/product_views.xml
@@ -19,13 +19,13 @@
                     <field name="secondary_uom_ids" colspan="4" nolabel="1">
                         <tree editable="bottom" decoration-muted="(not active)">
                             <field name="active" widget="boolean_toggle" />
-                            <field name="product_tmpl_id" invisible="1" />
+                            <field name="product_tmpl_id" column_invisible="1" />
                             <field
                                 name="product_id"
                                 domain="[('product_tmpl_id', '=', parent.id)]"
                                 groups="product.group_product_variant"
                                 options="{'no_create': True}"
-                                attrs="{'column_invisible': [('parent.product_variant_count', '&lt;=', 1)]}"
+                                column_invisible="parent.product_variant_count &lt;= 1"
                             />
                             <field name="code" />
                             <field name="name" />

From b9898e4569c1f57ccaff6dc7ad4e309ec921aa83 Mon Sep 17 00:00:00 2001
From: Franck Plazanet <franck@plazanet.ovh>
Date: Tue, 12 Nov 2024 13:33:22 +0000
Subject: [PATCH 37/58] [IMP] product_secondary_unit: pre-commit auto fixes

---
 .../models/product_secondary_unit_mixin.py                  | 6 +++---
 product_secondary_unit/views/product_views.xml              | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/product_secondary_unit/models/product_secondary_unit_mixin.py b/product_secondary_unit/models/product_secondary_unit_mixin.py
index 527f187da21..276c4184b92 100644
--- a/product_secondary_unit/models/product_secondary_unit_mixin.py
+++ b/product_secondary_unit/models/product_secondary_unit_mixin.py
@@ -105,9 +105,9 @@ def _compute_helper_target_field_qty(self):
                 continue
             if rec.secondary_uom_id.dependency_type == "independent":
                 if rec[rec._secondary_unit_fields["qty_field"]] == 0.0:
-                    rec[
-                        rec._secondary_unit_fields["qty_field"]
-                    ] = default_qty_field_value
+                    rec[rec._secondary_unit_fields["qty_field"]] = (
+                        default_qty_field_value
+                    )
                 continue
             # To avoid recompute secondary_uom_qty field when
             # secondary_uom_id changes.
diff --git a/product_secondary_unit/views/product_views.xml b/product_secondary_unit/views/product_views.xml
index a24666be776..fc44ab52733 100644
--- a/product_secondary_unit/views/product_views.xml
+++ b/product_secondary_unit/views/product_views.xml
@@ -52,5 +52,4 @@
             </xpath>
         </field>
     </record>
-
 </odoo>

From 2940a4ad52ee847170d64b91f71a50743075c74d Mon Sep 17 00:00:00 2001
From: Franck Plazanet <franck@plazanet.ovh>
Date: Wed, 15 Jan 2025 04:58:26 +0000
Subject: [PATCH 38/58] [MIG] product_secondary_unit: Migration to 18.0

---
 product_secondary_unit/README.rst             | 20 ++--
 product_secondary_unit/__manifest__.py        |  2 +-
 .../static/description/index.html             |  6 +-
 .../tests/test_product_second_unit.py         | 98 +++++++++++++++++++
 .../tests/test_secondary_unit_mixin.py        | 27 +++++
 .../views/product_views.xml                   |  7 +-
 6 files changed, 142 insertions(+), 18 deletions(-)

diff --git a/product_secondary_unit/README.rst b/product_secondary_unit/README.rst
index 3dd6c662a35..20343db19fb 100644
--- a/product_secondary_unit/README.rst
+++ b/product_secondary_unit/README.rst
@@ -17,13 +17,13 @@ Product 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%2Fproduct--attribute-lightgray.png?logo=github
-    :target: https://github.com/OCA/product-attribute/tree/17.0/product_secondary_unit
+    :target: https://github.com/OCA/product-attribute/tree/18.0/product_secondary_unit
     :alt: OCA/product-attribute
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/product-attribute-17-0/product-attribute-17-0-product_secondary_unit
+    :target: https://translation.odoo-community.org/projects/product-attribute-18-0/product-attribute-18-0-product_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/product-attribute&target_branch=17.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/product-attribute&target_branch=18.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -51,7 +51,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/product-attribute/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/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/product-attribute/issues/new?body=module:%20product_secondary_unit%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.
 
@@ -66,11 +66,11 @@ Authors
 Contributors
 ------------
 
--  Carlos Dauden <carlos.dauden@tecnativa.com>
--  Sergio Teruel <sergio.teruel@tecnativa.com>
--  Kitti Upariphutthiphong <kittiu@ecosoft.co.th>
--  Pimolnat Suntian <pimolnats@ecosoft.co.th>
--  Alan Ramos <alan.ramos@jarsa.com.mx>
+- Carlos Dauden <carlos.dauden@tecnativa.com>
+- Sergio Teruel <sergio.teruel@tecnativa.com>
+- Kitti Upariphutthiphong <kittiu@ecosoft.co.th>
+- Pimolnat Suntian <pimolnats@ecosoft.co.th>
+- Alan Ramos <alan.ramos@jarsa.com.mx>
 
 Maintainers
 -----------
@@ -93,6 +93,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-sergio-teruel| 
 
-This module is part of the `OCA/product-attribute <https://github.com/OCA/product-attribute/tree/17.0/product_secondary_unit>`_ project on GitHub.
+This module is part of the `OCA/product-attribute <https://github.com/OCA/product-attribute/tree/18.0/product_secondary_unit>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index 19ca23ff380..bb474590594 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Product Secondary Unit",
     "summary": "Set a secondary unit per product",
-    "version": "17.0.1.0.0",
+    "version": "18.0.1.0.0",
     "development_status": "Production/Stable",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
diff --git a/product_secondary_unit/static/description/index.html b/product_secondary_unit/static/description/index.html
index c64a2eeec3d..28a21f763ed 100644
--- a/product_secondary_unit/static/description/index.html
+++ b/product_secondary_unit/static/description/index.html
@@ -369,7 +369,7 @@ <h1 class="title">Product Secondary Unit</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:3038be23ebd37dd87f7595ccf86308fa611b0a81df5134e31c81d12bb79f3f84
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.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/product-attribute/tree/17.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/product-attribute-17-0/product-attribute-17-0-product_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/product-attribute&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="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.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/product-attribute/tree/18.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/product-attribute-18-0/product-attribute-18-0-product_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/product-attribute&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 extends the functionality of product module to allow define
 other units with their conversion factor.</p>
 <p><strong>Table of contents</strong></p>
@@ -399,7 +399,7 @@ <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/product-attribute/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/product-attribute/issues/new?body=module:%20product_secondary_unit%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/product-attribute/issues/new?body=module:%20product_secondary_unit%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">
@@ -431,7 +431,7 @@ <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external image-reference" href="https://github.com/sergio-teruel"><img alt="sergio-teruel" src="https://github.com/sergio-teruel.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/product-attribute/tree/17.0/product_secondary_unit">OCA/product-attribute</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/product-attribute/tree/18.0/product_secondary_unit">OCA/product-attribute</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/product_secondary_unit/tests/test_product_second_unit.py b/product_secondary_unit/tests/test_product_second_unit.py
index cb7b070e93b..3bde2265e5a 100644
--- a/product_secondary_unit/tests/test_product_second_unit.py
+++ b/product_secondary_unit/tests/test_product_second_unit.py
@@ -1,7 +1,12 @@
 # Copyright 2018 Tecnativa - Sergio Teruel
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+import logging
+
+from odoo.fields import Command
 from odoo.tests import TransactionCase, tagged
 
+_logger = logging.getLogger(__name__)
+
 
 @tagged("post_install", "-at_install")
 class TestProductSecondaryUnit(TransactionCase):
@@ -39,9 +44,69 @@ def setUpClass(cls):
                 ],
             }
         )
+        cls.woods = cls.env["product.template"].create(
+            {
+                "name": "Piece of woods",
+                "list_price": 2000,
+                "uom_id": cls.product_uom_kg.id,
+                "uom_po_id": cls.product_uom_kg.id,
+                "secondary_uom_ids": [
+                    (
+                        0,
+                        0,
+                        {
+                            "code": "A",
+                            "name": "unit-700",
+                            "uom_id": cls.product_uom_unit.id,
+                            "factor": 0.7,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "code": "B",
+                            "name": "unit-900",
+                            "uom_id": cls.product_uom_unit.id,
+                            "factor": 0.9,
+                        },
+                    ),
+                ],
+            }
+        )
         cls.secondary_unit = cls.env["product.secondary.unit"].search(
             [("product_tmpl_id", "=", cls.product.id)], limit=1
         )
+        cls.densitiy = cls.env["product.attribute"].create(
+            [
+                {
+                    "name": "Density",
+                    "sequence": 1,
+                    "value_ids": [
+                        Command.create(
+                            {
+                                "name": "Low",
+                                "sequence": 1,
+                            }
+                        ),
+                        Command.create(
+                            {
+                                "name": "Heavy",
+                                "sequence": 2,
+                            }
+                        ),
+                    ],
+                }
+            ]
+        )
+        cls.low, cls.heavy = cls.densitiy.value_ids
+        cls.density_attribute_lines = cls.env["product.template.attribute.line"].create(
+            {
+                "product_tmpl_id": cls.woods.id,
+                "attribute_id": cls.densitiy.id,
+                "value_ids": [Command.set([cls.low.id, cls.heavy.id])],
+            }
+        )
 
     def test_product_secondary_unit_name(self):
         self.assertEqual(self.secondary_unit.name_get()[0][1], "unit-700-0.7")
@@ -58,3 +123,36 @@ def test_product_secondary_unit_search(self):
         self.assertEqual(len(name_get), 1)
         name_get = self.env["product.secondary.unit"].name_search(name="X", args=args)
         self.assertEqual(len(name_get), 0)
+
+    def test_multi_variant_product_secondary_unit(self):
+        first_variant = self.woods.product_variant_ids[0]
+        second_variant = self.woods.product_variant_ids[1]
+        self.assertEqual(len(self.woods.secondary_uom_ids), 2)
+        self.assertEqual(first_variant.secondary_uom_ids, self.woods.secondary_uom_ids)
+
+        first_variant.write(
+            {
+                "secondary_uom_ids": [
+                    (
+                        0,
+                        0,
+                        {
+                            "code": "C",
+                            "name": "unit-1000",
+                            "product_id": first_variant.id,
+                            "uom_id": self.product_uom_unit.id,
+                            "factor": 0.1,
+                        },
+                    ),
+                ]
+            }
+        )
+        _logger.info(
+            f"Template 2Uoms: {self.woods.secondary_uom_ids.mapped('name')}"
+            f" -- Product var1 2Uoms: {first_variant.secondary_uom_ids.mapped('name')}"
+            f" -- Product var2 2Uoms: {second_variant.secondary_uom_ids.mapped('name')}"
+        )
+        first_variant.invalidate_recordset()
+        self.assertEqual(len(self.woods.secondary_uom_ids), 3)
+        self.assertEqual(len(first_variant.secondary_uom_ids), 3)
+        self.assertEqual(len(second_variant.secondary_uom_ids), 2)
diff --git a/product_secondary_unit/tests/test_secondary_unit_mixin.py b/product_secondary_unit/tests/test_secondary_unit_mixin.py
index df27d26ad54..f804355a495 100644
--- a/product_secondary_unit/tests/test_secondary_unit_mixin.py
+++ b/product_secondary_unit/tests/test_secondary_unit_mixin.py
@@ -43,11 +43,23 @@ def setUpClass(cls):
                             "factor": 10,
                         },
                     ),
+                    (
+                        0,
+                        0,
+                        {
+                            "code": "C20",
+                            "name": "box 20",
+                            "dependency_type": "independent",
+                            "uom_id": cls.product_uom_unit.id,
+                            "factor": 20,
+                        },
+                    ),
                 ],
             }
         )
         cls.secondary_unit_box_5 = cls.product_template.secondary_uom_ids[0]
         cls.secondary_unit_box_10 = cls.product_template.secondary_uom_ids[1]
+        cls.secondary_unit_box_20 = cls.product_template.secondary_uom_ids[2]
         # Fake model which inherit from
         cls.secondary_unit_fake = cls.env["secondary.unit.fake"].create(
             {
@@ -87,6 +99,21 @@ def test_product_secondary_unit_mixin(self):
         fake_model._onchange_helper_product_uom_for_secondary()
         self.assertEqual(fake_model.secondary_uom_qty, 12)
 
+    def test_product_secondary_unit_independent_mixin(self):
+        fake_model = self.secondary_unit_fake
+        fake_model.write(
+            {
+                "product_uom_qty": 20,
+                "secondary_uom_qty": 1,
+                "secondary_uom_id": self.secondary_unit_box_20.id,
+            }
+        )
+        self.assertEqual(fake_model.product_uom_qty, 20)
+        fake_model.invalidate_recordset()
+        fake_model.product_uom_id = self.product_uom_dozen
+        fake_model._onchange_helper_product_uom_for_secondary()
+        self.assertEqual(fake_model.secondary_uom_qty, 1)
+
     def test_product_secondary_unit_mixin_no_uom(self):
         # If secondary_uom_id is not informed product_qty on target model is
         # not computed.
diff --git a/product_secondary_unit/views/product_views.xml b/product_secondary_unit/views/product_views.xml
index fc44ab52733..f8c4bd1b5a4 100644
--- a/product_secondary_unit/views/product_views.xml
+++ b/product_secondary_unit/views/product_views.xml
@@ -17,9 +17,8 @@
                     groups="uom.group_uom"
                 >
                     <field name="secondary_uom_ids" colspan="4" nolabel="1">
-                        <tree editable="bottom" decoration-muted="(not active)">
+                        <list editable="bottom" decoration-muted="(not active)">
                             <field name="active" widget="boolean_toggle" />
-                            <field name="product_tmpl_id" column_invisible="1" />
                             <field
                                 name="product_id"
                                 domain="[('product_tmpl_id', '=', parent.id)]"
@@ -32,7 +31,7 @@
                             <field name="uom_id" />
                             <field name="factor" />
                             <field name="dependency_type" />
-                        </tree>
+                        </list>
                     </field>
                 </group>
             </xpath>
@@ -45,7 +44,7 @@
         <field name="inherit_id" ref="product.product_normal_form_view" />
         <field name="arch" type="xml">
             <xpath
-                expr="//field[@name='secondary_uom_ids']/tree/field[@name='product_id']"
+                expr="//field[@name='secondary_uom_ids']/list/field[@name='product_id']"
                 position="attributes"
             >
                 <attribute name="domain">[('id', '=', parent.id)]</attribute>

From 4b925a1aca8943917bc4b2ef30928decaa0ece9c Mon Sep 17 00:00:00 2001
From: pilarvargas-tecnativa <pilar.vargas@tecnativa.com>
Date: Fri, 28 Feb 2025 08:02:17 +0100
Subject: [PATCH 39/58] [MIG] product_secondary_unit: Continue migration to
 18.0

TT54231
---
 product_secondary_unit/README.rst             | 10 ++--
 .../models/product_second_unit.py             | 14 ++----
 .../tests/test_product_second_unit.py         | 47 ++++++++-----------
 .../tests/test_secondary_unit_mixin.py        | 19 +++-----
 4 files changed, 35 insertions(+), 55 deletions(-)

diff --git a/product_secondary_unit/README.rst b/product_secondary_unit/README.rst
index 20343db19fb..e1272672a95 100644
--- a/product_secondary_unit/README.rst
+++ b/product_secondary_unit/README.rst
@@ -66,11 +66,11 @@ Authors
 Contributors
 ------------
 
-- Carlos Dauden <carlos.dauden@tecnativa.com>
-- Sergio Teruel <sergio.teruel@tecnativa.com>
-- Kitti Upariphutthiphong <kittiu@ecosoft.co.th>
-- Pimolnat Suntian <pimolnats@ecosoft.co.th>
-- Alan Ramos <alan.ramos@jarsa.com.mx>
+-  Carlos Dauden <carlos.dauden@tecnativa.com>
+-  Sergio Teruel <sergio.teruel@tecnativa.com>
+-  Kitti Upariphutthiphong <kittiu@ecosoft.co.th>
+-  Pimolnat Suntian <pimolnats@ecosoft.co.th>
+-  Alan Ramos <alan.ramos@jarsa.com.mx>
 
 Maintainers
 -----------
diff --git a/product_secondary_unit/models/product_second_unit.py b/product_secondary_unit/models/product_second_unit.py
index 5e554e26ce7..fb8d813d5a5 100644
--- a/product_secondary_unit/models/product_second_unit.py
+++ b/product_secondary_unit/models/product_second_unit.py
@@ -42,16 +42,10 @@ class ProductSecondaryUnit(models.Model):
     factor = fields.Float(string="Secondary Unit Factor", default=1.0, required=True)
     active = fields.Boolean(default=True)
 
-    def name_get(self):
-        result = []
+    @api.depends("name", "factor")
+    def _compute_display_name(self):
         for unit in self:
-            result.append(
-                (
-                    unit.id,
-                    f"{unit.name}-{unit.factor}",
-                )
-            )
-        return result
+            unit.display_name = f"{unit.name}-{unit.factor}"
 
     @api.model
     def name_search(self, name="", args=None, operator="ilike", limit=100):
@@ -62,4 +56,4 @@ def name_search(self, name="", args=None, operator="ilike", limit=100):
             return super().name_search(
                 name=name, args=args, operator=operator, limit=limit
             )
-        return units.name_get()
+        return [(unit.id, unit.sudo().display_name) for unit in units]
diff --git a/product_secondary_unit/tests/test_product_second_unit.py b/product_secondary_unit/tests/test_product_second_unit.py
index 3bde2265e5a..c038b1bcfa5 100644
--- a/product_secondary_unit/tests/test_product_second_unit.py
+++ b/product_secondary_unit/tests/test_product_second_unit.py
@@ -21,9 +21,7 @@ def setUpClass(cls):
                 "uom_id": cls.product_uom_kg.id,
                 "uom_po_id": cls.product_uom_kg.id,
                 "secondary_uom_ids": [
-                    (
-                        0,
-                        0,
+                    Command.create(
                         {
                             "code": "A",
                             "name": "unit-700",
@@ -31,9 +29,7 @@ def setUpClass(cls):
                             "factor": 0.7,
                         },
                     ),
-                    (
-                        0,
-                        0,
+                    Command.create(
                         {
                             "code": "B",
                             "name": "unit-900",
@@ -51,9 +47,7 @@ def setUpClass(cls):
                 "uom_id": cls.product_uom_kg.id,
                 "uom_po_id": cls.product_uom_kg.id,
                 "secondary_uom_ids": [
-                    (
-                        0,
-                        0,
+                    Command.create(
                         {
                             "code": "A",
                             "name": "unit-700",
@@ -61,9 +55,7 @@ def setUpClass(cls):
                             "factor": 0.7,
                         },
                     ),
-                    (
-                        0,
-                        0,
+                    Command.create(
                         {
                             "code": "B",
                             "name": "unit-900",
@@ -109,7 +101,7 @@ def setUpClass(cls):
         )
 
     def test_product_secondary_unit_name(self):
-        self.assertEqual(self.secondary_unit.name_get()[0][1], "unit-700-0.7")
+        self.assertEqual(self.secondary_unit.sudo().display_name, "unit-700-0.7")
 
     def test_product_secondary_unit_search(self):
         args = [
@@ -119,39 +111,38 @@ def test_product_secondary_unit_search(self):
                 self.product.product_variant_ids.ids,
             )
         ]
-        name_get = self.env["product.secondary.unit"].name_search(name="A", args=args)
-        self.assertEqual(len(name_get), 1)
-        name_get = self.env["product.secondary.unit"].name_search(name="X", args=args)
-        self.assertEqual(len(name_get), 0)
+        results = self.env["product.secondary.unit"].name_search(name="A", args=args)
+        self.assertEqual(len(results), 1)
+        self.assertEqual(
+            results[0][1],
+            self.env["product.secondary.unit"]
+            .browse(results[0][0])
+            .sudo()
+            .display_name,
+        )
+        results = self.env["product.secondary.unit"].name_search(name="X", args=args)
+        self.assertEqual(len(results), 0)
 
     def test_multi_variant_product_secondary_unit(self):
         first_variant = self.woods.product_variant_ids[0]
         second_variant = self.woods.product_variant_ids[1]
         self.assertEqual(len(self.woods.secondary_uom_ids), 2)
         self.assertEqual(first_variant.secondary_uom_ids, self.woods.secondary_uom_ids)
-
         first_variant.write(
             {
                 "secondary_uom_ids": [
-                    (
-                        0,
-                        0,
+                    Command.create(
                         {
                             "code": "C",
                             "name": "unit-1000",
                             "product_id": first_variant.id,
                             "uom_id": self.product_uom_unit.id,
                             "factor": 0.1,
-                        },
-                    ),
+                        }
+                    )
                 ]
             }
         )
-        _logger.info(
-            f"Template 2Uoms: {self.woods.secondary_uom_ids.mapped('name')}"
-            f" -- Product var1 2Uoms: {first_variant.secondary_uom_ids.mapped('name')}"
-            f" -- Product var2 2Uoms: {second_variant.secondary_uom_ids.mapped('name')}"
-        )
         first_variant.invalidate_recordset()
         self.assertEqual(len(self.woods.secondary_uom_ids), 3)
         self.assertEqual(len(first_variant.secondary_uom_ids), 3)
diff --git a/product_secondary_unit/tests/test_secondary_unit_mixin.py b/product_secondary_unit/tests/test_secondary_unit_mixin.py
index f804355a495..79427234eaa 100644
--- a/product_secondary_unit/tests/test_secondary_unit_mixin.py
+++ b/product_secondary_unit/tests/test_secondary_unit_mixin.py
@@ -2,6 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from odoo_test_helper import FakeModelLoader
 
+from odoo.fields import Command
 from odoo.tests import TransactionCase
 
 
@@ -23,36 +24,30 @@ def setUpClass(cls):
                 "uom_id": cls.product_uom_kg.id,
                 "uom_po_id": cls.product_uom_kg.id,
                 "secondary_uom_ids": [
-                    (
-                        0,
-                        0,
+                    Command.create(
                         {
                             "code": "C5",
                             "name": "box 5",
                             "uom_id": cls.product_uom_unit.id,
                             "factor": 5,
-                        },
+                        }
                     ),
-                    (
-                        0,
-                        0,
+                    Command.create(
                         {
                             "code": "C10",
                             "name": "box 10",
                             "uom_id": cls.product_uom_unit.id,
                             "factor": 10,
-                        },
+                        }
                     ),
-                    (
-                        0,
-                        0,
+                    Command.create(
                         {
                             "code": "C20",
                             "name": "box 20",
                             "dependency_type": "independent",
                             "uom_id": cls.product_uom_unit.id,
                             "factor": 20,
-                        },
+                        }
                     ),
                 ],
             }

From 5cd48aa97c404ec32bc2e5199082aa44967af5d1 Mon Sep 17 00:00:00 2001
From: oca-ci <oca-ci@odoo-community.org>
Date: Wed, 5 Mar 2025 19:00:18 +0000
Subject: [PATCH 40/58] [UPD] Update product_secondary_unit.pot

---
 product_secondary_unit/i18n/product_secondary_unit.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/product_secondary_unit/i18n/product_secondary_unit.pot b/product_secondary_unit/i18n/product_secondary_unit.pot
index 40aa3eda3b5..f6c4ebb48f8 100644
--- a/product_secondary_unit/i18n/product_secondary_unit.pot
+++ b/product_secondary_unit/i18n/product_secondary_unit.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 17.0\n"
+"Project-Id-Version: Odoo Server 18.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"

From 8da52805bf4a2a9fc3e9e0da05e866cd3ad768e1 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Wed, 5 Mar 2025 19:03:26 +0000
Subject: [PATCH 41/58] [BOT] post-merge updates

---
 product_secondary_unit/README.rst                    | 12 ++++++------
 product_secondary_unit/static/description/index.html |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/product_secondary_unit/README.rst b/product_secondary_unit/README.rst
index e1272672a95..2fce241c904 100644
--- a/product_secondary_unit/README.rst
+++ b/product_secondary_unit/README.rst
@@ -7,7 +7,7 @@ Product Secondary Unit
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:3038be23ebd37dd87f7595ccf86308fa611b0a81df5134e31c81d12bb79f3f84
+   !! source digest: sha256:e8d4f483bb8554dcf9fc66c65aa717a2864ce8337bfba20143fc889bd9e72645
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
@@ -66,11 +66,11 @@ Authors
 Contributors
 ------------
 
--  Carlos Dauden <carlos.dauden@tecnativa.com>
--  Sergio Teruel <sergio.teruel@tecnativa.com>
--  Kitti Upariphutthiphong <kittiu@ecosoft.co.th>
--  Pimolnat Suntian <pimolnats@ecosoft.co.th>
--  Alan Ramos <alan.ramos@jarsa.com.mx>
+- Carlos Dauden <carlos.dauden@tecnativa.com>
+- Sergio Teruel <sergio.teruel@tecnativa.com>
+- Kitti Upariphutthiphong <kittiu@ecosoft.co.th>
+- Pimolnat Suntian <pimolnats@ecosoft.co.th>
+- Alan Ramos <alan.ramos@jarsa.com.mx>
 
 Maintainers
 -----------
diff --git a/product_secondary_unit/static/description/index.html b/product_secondary_unit/static/description/index.html
index 28a21f763ed..59a50a64825 100644
--- a/product_secondary_unit/static/description/index.html
+++ b/product_secondary_unit/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Product Secondary Unit</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:3038be23ebd37dd87f7595ccf86308fa611b0a81df5134e31c81d12bb79f3f84
+!! source digest: sha256:e8d4f483bb8554dcf9fc66c65aa717a2864ce8337bfba20143fc889bd9e72645
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.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/product-attribute/tree/18.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/product-attribute-18-0/product-attribute-18-0-product_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/product-attribute&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 extends the functionality of product module to allow define

From b0f57fcc5444e7941c8844b8246dc75cdd9651ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bet=C3=BCl=20=C3=96=C4=9Fmen?= <betulo@eska.biz>
Date: Wed, 4 Jun 2025 07:38:18 +0000
Subject: [PATCH 42/58] Added translation using Weblate (Turkish)

---
 product_secondary_unit/i18n/tr.po | 140 ++++++++++++++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 product_secondary_unit/i18n/tr.po

diff --git a/product_secondary_unit/i18n/tr.po b/product_secondary_unit/i18n/tr.po
new file mode 100644
index 00000000000..35c5d1557d2
--- /dev/null
+++ b/product_secondary_unit/i18n/tr.po
@@ -0,0 +1,140 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* product_secondary_unit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__active
+msgid "Active"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__code
+msgid "Code"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,help:product_secondary_unit.field_product_template__secondary_uom_ids
+msgid "Default Secondary Unit of Measure."
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid "Dependency Type"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__dependent
+msgid "Dependent"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
+msgid "ID"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid ""
+"If dependency type is 'dependent' the factor is used to compute quantity in "
+"primary unit,otherwise primary and secondary unit are independent. For "
+"example if you sell serviceby package (1 unit for example) and you want to "
+"put the real time (ex : 4 hours) to allows employee scheduling"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__independent
+msgid "Independent"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__name
+msgid "Name"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_template
+msgid "Product"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
+msgid "Product Secondary Unit"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit_mixin
+msgid "Product Secondary Unit Mixin"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
+msgid "Product Template"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_product
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_id
+msgid "Product Variant"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_id
+msgid "Second unit"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_qty
+msgid "Secondary Qty"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__factor
+msgid "Secondary Unit Factor"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+msgid "Secondary Unit of Measure"
+msgstr ""

From 6960130a5d57590f85c250b519fd18e9ddfbc48e Mon Sep 17 00:00:00 2001
From: pilarvargas-tecnativa <pilar.vargas@tecnativa.com>
Date: Thu, 26 Jun 2025 15:00:46 +0200
Subject: [PATCH 43/58] [FIX] product_secondary_unit: restore search by code
 and name

---
 product_secondary_unit/models/product_second_unit.py | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/product_secondary_unit/models/product_second_unit.py b/product_secondary_unit/models/product_second_unit.py
index fb8d813d5a5..d9d16757a66 100644
--- a/product_secondary_unit/models/product_second_unit.py
+++ b/product_secondary_unit/models/product_second_unit.py
@@ -6,6 +6,7 @@
 class ProductSecondaryUnit(models.Model):
     _name = "product.secondary.unit"
     _description = "Product Secondary Unit"
+    _rec_names_search = ["name", "code"]
 
     name = fields.Char(required=True, translate=True)
     code = fields.Char()
@@ -46,14 +47,3 @@ class ProductSecondaryUnit(models.Model):
     def _compute_display_name(self):
         for unit in self:
             unit.display_name = f"{unit.name}-{unit.factor}"
-
-    @api.model
-    def name_search(self, name="", args=None, operator="ilike", limit=100):
-        if args is None:
-            args = []
-        units = self.search([("code", "=", name)] + args, limit=1)
-        if not units:
-            return super().name_search(
-                name=name, args=args, operator=operator, limit=limit
-            )
-        return [(unit.id, unit.sudo().display_name) for unit in units]

From 928cc7099f6da6c412dd9d654a0ecabfc8175f2c Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 26 Jun 2025 13:32:37 +0000
Subject: [PATCH 44/58] [BOT] post-merge updates

---
 product_secondary_unit/README.rst             |  8 ++++--
 product_secondary_unit/__manifest__.py        |  2 +-
 .../static/description/index.html             | 28 +++++++++++--------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/product_secondary_unit/README.rst b/product_secondary_unit/README.rst
index 2fce241c904..c061b212cb2 100644
--- a/product_secondary_unit/README.rst
+++ b/product_secondary_unit/README.rst
@@ -1,3 +1,7 @@
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
 ======================
 Product Secondary Unit
 ======================
@@ -7,13 +11,13 @@ Product Secondary Unit
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:e8d4f483bb8554dcf9fc66c65aa717a2864ce8337bfba20143fc889bd9e72645
+   !! source digest: sha256:0029efd789786ccc3b328f612bf8dec00c53357a6b825b322a5170cdc451ba88
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
     :target: https://odoo-community.org/page/development-status
     :alt: Production/Stable
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/license-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%2Fproduct--attribute-lightgray.png?logo=github
diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index bb474590594..fb00c049418 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Product Secondary Unit",
     "summary": "Set a secondary unit per product",
-    "version": "18.0.1.0.0",
+    "version": "18.0.1.0.1",
     "development_status": "Production/Stable",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
diff --git a/product_secondary_unit/static/description/index.html b/product_secondary_unit/static/description/index.html
index 59a50a64825..cf3800afb65 100644
--- a/product_secondary_unit/static/description/index.html
+++ b/product_secondary_unit/static/description/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>Product Secondary Unit</title>
+<title>README.rst</title>
 <style type="text/css">
 
 /*
@@ -360,16 +360,21 @@
 </style>
 </head>
 <body>
-<div class="document" id="product-secondary-unit">
-<h1 class="title">Product Secondary Unit</h1>
+<div class="document">
 
+
+<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
+<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
+</a>
+<div class="section" id="product-secondary-unit">
+<h1>Product Secondary Unit</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:e8d4f483bb8554dcf9fc66c65aa717a2864ce8337bfba20143fc889bd9e72645
+!! source digest: sha256:0029efd789786ccc3b328f612bf8dec00c53357a6b825b322a5170cdc451ba88
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.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/product-attribute/tree/18.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/product-attribute-18-0/product-attribute-18-0-product_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/product-attribute&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><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.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/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/product-attribute/tree/18.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/product-attribute-18-0/product-attribute-18-0-product_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/product-attribute&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 extends the functionality of product module to allow define
 other units with their conversion factor.</p>
 <p><strong>Table of contents</strong></p>
@@ -386,7 +391,7 @@ <h1 class="title">Product Secondary Unit</h1>
 </ul>
 </div>
 <div class="section" id="usage">
-<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
 <p>To use this module you need to:</p>
 <ol class="arabic simple">
 <li>Go to a <em>Product &gt; General Information tab</em>.</li>
@@ -395,7 +400,7 @@ <h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
 </ol>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/product-attribute/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
@@ -403,15 +408,15 @@ <h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-3">Credits</a></h2>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-4">Authors</a></h3>
 <ul class="simple">
 <li>Tecnativa</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-5">Contributors</a></h3>
 <ul class="simple">
 <li>Carlos Dauden &lt;<a class="reference external" href="mailto:carlos.dauden&#64;tecnativa.com">carlos.dauden&#64;tecnativa.com</a>&gt;</li>
 <li>Sergio Teruel &lt;<a class="reference external" href="mailto:sergio.teruel&#64;tecnativa.com">sergio.teruel&#64;tecnativa.com</a>&gt;</li>
@@ -421,7 +426,7 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h3>
 <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" />
@@ -436,5 +441,6 @@ <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 </div>
 </div>
 </div>
+</div>
 </body>
 </html>

From 32dc9b98e501414ef3034eff0e210c0c18dc7a4a Mon Sep 17 00:00:00 2001
From: vladimiruvid <vladimir@uvid.hr>
Date: Mon, 29 Sep 2025 08:01:18 +0000
Subject: [PATCH 45/58] Added translation using Weblate (Croatian)

---
 product_secondary_unit/i18n/hr.po | 141 ++++++++++++++++++++++++++++++
 1 file changed, 141 insertions(+)
 create mode 100644 product_secondary_unit/i18n/hr.po

diff --git a/product_secondary_unit/i18n/hr.po b/product_secondary_unit/i18n/hr.po
new file mode 100644
index 00000000000..ff011cdf10d
--- /dev/null
+++ b/product_secondary_unit/i18n/hr.po
@@ -0,0 +1,141 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* product_secondary_unit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: hr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__active
+msgid "Active"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__code
+msgid "Code"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,help:product_secondary_unit.field_product_template__secondary_uom_ids
+msgid "Default Secondary Unit of Measure."
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid "Dependency Type"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__dependent
+msgid "Dependent"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
+msgid "ID"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid ""
+"If dependency type is 'dependent' the factor is used to compute quantity in "
+"primary unit,otherwise primary and secondary unit are independent. For "
+"example if you sell serviceby package (1 unit for example) and you want to "
+"put the real time (ex : 4 hours) to allows employee scheduling"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__independent
+msgid "Independent"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__name
+msgid "Name"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_template
+msgid "Product"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
+msgid "Product Secondary Unit"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit_mixin
+msgid "Product Secondary Unit Mixin"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
+msgid "Product Template"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_product
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_id
+msgid "Product Variant"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_id
+msgid "Second unit"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_qty
+msgid "Secondary Qty"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__factor
+msgid "Secondary Unit Factor"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+msgid "Secondary Unit of Measure"
+msgstr ""

From 02392bea854178dc79f1c92493a58248a332753a Mon Sep 17 00:00:00 2001
From: vladimiruvid <vladimir@uvid.hr>
Date: Mon, 29 Sep 2025 08:01:39 +0000
Subject: [PATCH 46/58] Translated using Weblate (Croatian)

Currently translated at 100.0% (23 of 23 strings)

Translation: product-attribute-18.0/product-attribute-18.0-product_secondary_unit
Translate-URL: https://translation.odoo-community.org/projects/product-attribute-18-0/product-attribute-18-0-product_secondary_unit/hr/
---
 product_secondary_unit/i18n/hr.po | 52 +++++++++++++++++--------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/product_secondary_unit/i18n/hr.po b/product_secondary_unit/i18n/hr.po
index ff011cdf10d..2c8181ccfa6 100644
--- a/product_secondary_unit/i18n/hr.po
+++ b/product_secondary_unit/i18n/hr.po
@@ -6,7 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 18.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2025-09-29 08:08+0000\n"
+"Last-Translator: vladimiruvid <vladimir@uvid.hr>\n"
 "Language-Team: none\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
@@ -14,53 +15,54 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 5.10.4\n"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__active
 msgid "Active"
-msgstr ""
+msgstr "Aktivno"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__code
 msgid "Code"
-msgstr ""
+msgstr "Šifra"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_uid
 msgid "Created by"
-msgstr ""
+msgstr "Kreirao"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_date
 msgid "Created on"
-msgstr ""
+msgstr "Kreirano"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,help:product_secondary_unit.field_product_product__secondary_uom_ids
 #: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__uom_id
 #: model:ir.model.fields,help:product_secondary_unit.field_product_template__secondary_uom_ids
 msgid "Default Secondary Unit of Measure."
-msgstr ""
+msgstr "Zadana sekundarna mjerna jedinica."
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__dependency_type
 msgid "Dependency Type"
-msgstr ""
+msgstr "Vrsta ovisnosti"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__dependent
 msgid "Dependent"
-msgstr ""
+msgstr "Ovisno"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Naziv za prikaz"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__dependency_type
@@ -70,67 +72,71 @@ msgid ""
 "example if you sell serviceby package (1 unit for example) and you want to "
 "put the real time (ex : 4 hours) to allows employee scheduling"
 msgstr ""
+"Ako je vrsta ovisnosti 'ovisna', faktor se koristi za izračun količine u "
+"primarnoj jedinici, inače su primarna i sekundarna jedinica neovisne. Na "
+"primjer, ako prodajete uslugu po paketu (npr. 1 jedinica) i želite postaviti "
+"stvarno vrijeme (npr. 4 sata) kako biste omogućili raspoređivanje zaposlenika"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__independent
 msgid "Independent"
-msgstr ""
+msgstr "Neovisno"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
 msgid "Last Updated by"
-msgstr ""
+msgstr "Zadnje ažurirao"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_date
 msgid "Last Updated on"
-msgstr ""
+msgstr "Zadnje ažurirano"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__name
 msgid "Name"
-msgstr ""
+msgstr "Naziv"
 
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_template
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
 msgid "Product Secondary Unit"
-msgstr ""
+msgstr "Sekundarna jedinica proizvoda"
 
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_secondary_unit_mixin
 msgid "Product Secondary Unit Mixin"
-msgstr ""
+msgstr "Miješana sekundarna jedinica proizvoda"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
 msgid "Product Template"
-msgstr ""
+msgstr "Predložak proizvoda"
 
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_product
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_id
 msgid "Product Variant"
-msgstr ""
+msgstr "Varijanta proizvoda"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_id
 msgid "Second unit"
-msgstr ""
+msgstr "Alt. jedinica"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_qty
 msgid "Secondary Qty"
-msgstr ""
+msgstr "Alt. količina"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__factor
 msgid "Secondary Unit Factor"
-msgstr ""
+msgstr "Alt. omjer"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_product__secondary_uom_ids
@@ -138,4 +144,4 @@ msgstr ""
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
 #: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
 msgid "Secondary Unit of Measure"
-msgstr ""
+msgstr "Alt. JM"

From b571bf22fc5f8ee6a30f3a590eb0378c2629dca3 Mon Sep 17 00:00:00 2001
From: Graeme Gellatly <gdgellatly@gmail.com>
Date: Thu, 4 Sep 2025 11:01:01 +1200
Subject: [PATCH 47/58] [FIX] product_secondary_unit: don't show inactive UoMs

---
 product_secondary_unit/views/product_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/product_secondary_unit/views/product_views.xml b/product_secondary_unit/views/product_views.xml
index f8c4bd1b5a4..09a33a9204f 100644
--- a/product_secondary_unit/views/product_views.xml
+++ b/product_secondary_unit/views/product_views.xml
@@ -28,7 +28,7 @@
                             />
                             <field name="code" />
                             <field name="name" />
-                            <field name="uom_id" />
+                            <field name="uom_id" context="{'active_test': True}" />
                             <field name="factor" />
                             <field name="dependency_type" />
                         </list>

From 467133c70c6020b4bffaabddc3fa9d78f17b7ee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bet=C3=BCl=20=C3=96=C4=9Fmen?= <betulo@eska.biz>
Date: Mon, 24 Nov 2025 12:07:03 +0000
Subject: [PATCH 48/58] Translated using Weblate (Turkish)

Currently translated at 95.6% (22 of 23 strings)

Translation: product-attribute-18.0/product-attribute-18.0-product_secondary_unit
Translate-URL: https://translation.odoo-community.org/projects/product-attribute-18-0/product-attribute-18-0-product_secondary_unit/tr/
---
 product_secondary_unit/i18n/tr.po | 50 +++++++++++++++++--------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/product_secondary_unit/i18n/tr.po b/product_secondary_unit/i18n/tr.po
index 35c5d1557d2..56c7046b004 100644
--- a/product_secondary_unit/i18n/tr.po
+++ b/product_secondary_unit/i18n/tr.po
@@ -6,55 +6,57 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 18.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2025-11-24 12:50+0000\n"
+"Last-Translator: Betül Öğmen <betulo@eska.biz>\n"
 "Language-Team: none\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 5.10.4\n"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__active
 msgid "Active"
-msgstr ""
+msgstr "Aktif"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__code
 msgid "Code"
-msgstr ""
+msgstr "Kod"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_uid
 msgid "Created by"
-msgstr ""
+msgstr "Oluşturan"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_date
 msgid "Created on"
-msgstr ""
+msgstr "Oluşturulma tarihi"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,help:product_secondary_unit.field_product_product__secondary_uom_ids
 #: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__uom_id
 #: model:ir.model.fields,help:product_secondary_unit.field_product_template__secondary_uom_ids
 msgid "Default Secondary Unit of Measure."
-msgstr ""
+msgstr "Varsayılan İkincil Ölçü Birimi."
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__dependency_type
 msgid "Dependency Type"
-msgstr ""
+msgstr "Bağımlılık Türü"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__dependent
 msgid "Dependent"
-msgstr ""
+msgstr "Bağımlı"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "İsim Göster"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
@@ -69,67 +71,71 @@ msgid ""
 "example if you sell serviceby package (1 unit for example) and you want to "
 "put the real time (ex : 4 hours) to allows employee scheduling"
 msgstr ""
+"Bağımlılık türü 'bağımlı' ise faktör birincil birimdeki miktarı hesaplamak "
+"için kullanılır, aksi takdirde birincil ve ikincil birim bağımsızdır. "
+"Örneğin, hizmeti paket olarak satıyorsanız (örneğin 1 birim) ve gerçek "
+"zamanı (örneğin: 4 saat) çalışan planlamasına izin vermek istiyorsanız"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__independent
 msgid "Independent"
-msgstr ""
+msgstr "Bağımsız"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
 msgid "Last Updated by"
-msgstr ""
+msgstr "Son Güncelleyen"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_date
 msgid "Last Updated on"
-msgstr ""
+msgstr "Son Güncelleme"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__name
 msgid "Name"
-msgstr ""
+msgstr "Ad"
 
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_template
 msgid "Product"
-msgstr ""
+msgstr "Ürün"
 
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
 msgid "Product Secondary Unit"
-msgstr ""
+msgstr "Ürün İkincil Birim"
 
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_secondary_unit_mixin
 msgid "Product Secondary Unit Mixin"
-msgstr ""
+msgstr "Ürün İkincil Birim Karışımı"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
 msgid "Product Template"
-msgstr ""
+msgstr "Ürün Şablonu"
 
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_product
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_id
 msgid "Product Variant"
-msgstr ""
+msgstr "Ürün Varyantı"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_id
 msgid "Second unit"
-msgstr ""
+msgstr "İkincil birim"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_qty
 msgid "Secondary Qty"
-msgstr ""
+msgstr "İkincil miktar"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__factor
 msgid "Secondary Unit Factor"
-msgstr ""
+msgstr "İkincil Birim Faktörü"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_product__secondary_uom_ids
@@ -137,4 +143,4 @@ msgstr ""
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
 #: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
 msgid "Secondary Unit of Measure"
-msgstr ""
+msgstr "İkincil Ölçü Birimi"

From 63674bdaff338d005b4c7ff183db7fec5a53208c Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Sun, 30 Nov 2025 16:10:52 +0000
Subject: [PATCH 49/58] [BOT] post-merge updates

---
 product_secondary_unit/README.rst                    | 2 +-
 product_secondary_unit/__manifest__.py               | 2 +-
 product_secondary_unit/static/description/index.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/product_secondary_unit/README.rst b/product_secondary_unit/README.rst
index c061b212cb2..6923954aa09 100644
--- a/product_secondary_unit/README.rst
+++ b/product_secondary_unit/README.rst
@@ -11,7 +11,7 @@ Product Secondary Unit
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:0029efd789786ccc3b328f612bf8dec00c53357a6b825b322a5170cdc451ba88
+   !! source digest: sha256:7c3631b2bfcbf6b7a703fcf35191a858aa0cb2b95ac103597c58663e10a9d49b
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index fb00c049418..7af44ebf5ef 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Product Secondary Unit",
     "summary": "Set a secondary unit per product",
-    "version": "18.0.1.0.1",
+    "version": "18.0.1.1.0",
     "development_status": "Production/Stable",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
diff --git a/product_secondary_unit/static/description/index.html b/product_secondary_unit/static/description/index.html
index cf3800afb65..c617ae3fe4e 100644
--- a/product_secondary_unit/static/description/index.html
+++ b/product_secondary_unit/static/description/index.html
@@ -372,7 +372,7 @@ <h1>Product Secondary Unit</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:0029efd789786ccc3b328f612bf8dec00c53357a6b825b322a5170cdc451ba88
+!! source digest: sha256:7c3631b2bfcbf6b7a703fcf35191a858aa0cb2b95ac103597c58663e10a9d49b
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.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/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/product-attribute/tree/18.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/product-attribute-18-0/product-attribute-18-0-product_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/product-attribute&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 extends the functionality of product module to allow define

From aae89e22c2e20f59b9c0bb371e05060725088b3d Mon Sep 17 00:00:00 2001
From: "Toshikimi Shigenobu (Quartile)" <nobu@quartile.co>
Date: Tue, 20 Jan 2026 09:33:55 +0000
Subject: [PATCH 50/58] Added translation using Weblate (Japanese)

---
 product_secondary_unit/i18n/ja.po | 140 ++++++++++++++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 product_secondary_unit/i18n/ja.po

diff --git a/product_secondary_unit/i18n/ja.po b/product_secondary_unit/i18n/ja.po
new file mode 100644
index 00000000000..00787b48de2
--- /dev/null
+++ b/product_secondary_unit/i18n/ja.po
@@ -0,0 +1,140 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* product_secondary_unit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__active
+msgid "Active"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__code
+msgid "Code"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,help:product_secondary_unit.field_product_template__secondary_uom_ids
+msgid "Default Secondary Unit of Measure."
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid "Dependency Type"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__dependent
+msgid "Dependent"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
+msgid "ID"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid ""
+"If dependency type is 'dependent' the factor is used to compute quantity in "
+"primary unit,otherwise primary and secondary unit are independent. For "
+"example if you sell serviceby package (1 unit for example) and you want to "
+"put the real time (ex : 4 hours) to allows employee scheduling"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__independent
+msgid "Independent"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__name
+msgid "Name"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_template
+msgid "Product"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
+msgid "Product Secondary Unit"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit_mixin
+msgid "Product Secondary Unit Mixin"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
+msgid "Product Template"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_product
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_id
+msgid "Product Variant"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_id
+msgid "Second unit"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_qty
+msgid "Secondary Qty"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__factor
+msgid "Secondary Unit Factor"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+msgid "Secondary Unit of Measure"
+msgstr ""

From 89a5a4daa735b77c04e949700297e5f79edb35c1 Mon Sep 17 00:00:00 2001
From: "Toshikimi Shigenobu (Quartile)" <nobu@quartile.co>
Date: Tue, 20 Jan 2026 09:36:04 +0000
Subject: [PATCH 51/58] Added translation using Weblate (Japanese (ja_JP)
 (ja_JP))

---
 product_secondary_unit/i18n/ja_JP.po | 140 +++++++++++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 product_secondary_unit/i18n/ja_JP.po

diff --git a/product_secondary_unit/i18n/ja_JP.po b/product_secondary_unit/i18n/ja_JP.po
new file mode 100644
index 00000000000..8a99751d7de
--- /dev/null
+++ b/product_secondary_unit/i18n/ja_JP.po
@@ -0,0 +1,140 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* product_secondary_unit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: ja_JP\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__active
+msgid "Active"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__code
+msgid "Code"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,help:product_secondary_unit.field_product_template__secondary_uom_ids
+msgid "Default Secondary Unit of Measure."
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid "Dependency Type"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__dependent
+msgid "Dependent"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
+msgid "ID"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__dependency_type
+msgid ""
+"If dependency type is 'dependent' the factor is used to compute quantity in "
+"primary unit,otherwise primary and secondary unit are independent. For "
+"example if you sell serviceby package (1 unit for example) and you want to "
+"put the real time (ex : 4 hours) to allows employee scheduling"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__independent
+msgid "Independent"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__name
+msgid "Name"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_template
+msgid "Product"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
+msgid "Product Secondary Unit"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_secondary_unit_mixin
+msgid "Product Secondary Unit Mixin"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
+msgid "Product Template"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model,name:product_secondary_unit.model_product_product
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_id
+msgid "Product Variant"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_id
+msgid "Second unit"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_qty
+msgid "Secondary Qty"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__factor
+msgid "Secondary Unit Factor"
+msgstr ""
+
+#. module: product_secondary_unit
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_product__secondary_uom_ids
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__uom_id
+#: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
+#: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
+msgid "Secondary Unit of Measure"
+msgstr ""

From 7582ec16442eaa9bbf696e120774192c57bdd820 Mon Sep 17 00:00:00 2001
From: "Toshikimi Shigenobu (Quartile)" <nobu@quartile.co>
Date: Tue, 20 Jan 2026 10:01:10 +0000
Subject: [PATCH 52/58] Translated using Weblate (Japanese)

Currently translated at 100.0% (23 of 23 strings)

Translation: product-attribute-18.0/product-attribute-18.0-product_secondary_unit
Translate-URL: https://translation.odoo-community.org/projects/product-attribute-18-0/product-attribute-18-0-product_secondary_unit/ja/
---
 product_secondary_unit/i18n/ja.po | 51 +++++++++++++++++--------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/product_secondary_unit/i18n/ja.po b/product_secondary_unit/i18n/ja.po
index 00787b48de2..0421c1a701d 100644
--- a/product_secondary_unit/i18n/ja.po
+++ b/product_secondary_unit/i18n/ja.po
@@ -6,60 +6,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 18.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2026-01-20 10:07+0000\n"
+"Last-Translator: \"Toshikimi Shigenobu (Quartile)\" <nobu@quartile.co>\n"
 "Language-Team: none\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 5.15.2\n"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__active
 msgid "Active"
-msgstr ""
+msgstr "有効"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__code
 msgid "Code"
-msgstr ""
+msgstr "コード"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_uid
 msgid "Created by"
-msgstr ""
+msgstr "作成者"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__create_date
 msgid "Created on"
-msgstr ""
+msgstr "作成日"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,help:product_secondary_unit.field_product_product__secondary_uom_ids
 #: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__uom_id
 #: model:ir.model.fields,help:product_secondary_unit.field_product_template__secondary_uom_ids
 msgid "Default Secondary Unit of Measure."
-msgstr ""
+msgstr "デフォルト副単位."
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__dependency_type
 msgid "Dependency Type"
-msgstr ""
+msgstr "依存タイプ"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__dependent
 msgid "Dependent"
-msgstr ""
+msgstr "依存"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "表示名"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,help:product_secondary_unit.field_product_secondary_unit__dependency_type
@@ -69,67 +71,70 @@ msgid ""
 "example if you sell serviceby package (1 unit for example) and you want to "
 "put the real time (ex : 4 hours) to allows employee scheduling"
 msgstr ""
+"依存タイプが「依存」の場合、係数を使って主単位の数量を計算します。そうしなけ"
+"れば主単位と副単位は独立します。例えばサービスをパッケージ（例：1単位）で販売"
+"し、実時間（例：4時間）を入力して社員のスケジューリングに使いたい場合などです"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields.selection,name:product_secondary_unit.selection__product_secondary_unit__dependency_type__independent
 msgid "Independent"
-msgstr ""
+msgstr "独立"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_uid
 msgid "Last Updated by"
-msgstr ""
+msgstr "最終更新者"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__write_date
 msgid "Last Updated on"
-msgstr ""
+msgstr "最終更新日"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__name
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_template
 msgid "Product"
-msgstr ""
+msgstr "プロダクト"
 
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_secondary_unit
 msgid "Product Secondary Unit"
-msgstr ""
+msgstr "プロダクト副単位"
 
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_secondary_unit_mixin
 msgid "Product Secondary Unit Mixin"
-msgstr ""
+msgstr "プロダクト副単位ミックスイン"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_tmpl_id
 msgid "Product Template"
-msgstr ""
+msgstr "プロダクトテンプレート"
 
 #. module: product_secondary_unit
 #: model:ir.model,name:product_secondary_unit.model_product_product
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__product_id
 msgid "Product Variant"
-msgstr ""
+msgstr "プロダクトバリアント"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_id
 msgid "Second unit"
-msgstr ""
+msgstr "副単位"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit_mixin__secondary_uom_qty
 msgid "Secondary Qty"
-msgstr ""
+msgstr "副数量"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_secondary_unit__factor
 msgid "Secondary Unit Factor"
-msgstr ""
+msgstr "副単位係数"
 
 #. module: product_secondary_unit
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_product__secondary_uom_ids
@@ -137,4 +142,4 @@ msgstr ""
 #: model:ir.model.fields,field_description:product_secondary_unit.field_product_template__secondary_uom_ids
 #: model_terms:ir.ui.view,arch_db:product_secondary_unit.product_template_form_view
 msgid "Secondary Unit of Measure"
-msgstr ""
+msgstr "副単位"

From 126e9de629fb180b45768cc1f9beae24fb1c6121 Mon Sep 17 00:00:00 2001
From: Aungkokolin1997 <lin@quartile.co>
Date: Tue, 6 Jan 2026 10:17:15 +0000
Subject: [PATCH 53/58] [FIX] product_secondary_unit: UoM conversion in
 secondary unit mixin

Replace _get_factor_line() with uom._compute_quantity() to fix incorrect
conversion when line UoM differs from product's base UoM. The previous method
failed for certain UoM combinations (e.g., line in L, product in mL).

Co-authored-by: Yoshi Tashiro <tashiro@quartile.co>
---
 .../models/product_secondary_unit_mixin.py    | 41 +++++++++--------
 .../tests/test_secondary_unit_mixin.py        | 46 +++++++++++++++++--
 2 files changed, 65 insertions(+), 22 deletions(-)

diff --git a/product_secondary_unit/models/product_secondary_unit_mixin.py b/product_secondary_unit/models/product_secondary_unit_mixin.py
index 276c4184b92..7129d152ce5 100644
--- a/product_secondary_unit/models/product_secondary_unit_mixin.py
+++ b/product_secondary_unit/models/product_secondary_unit_mixin.py
@@ -55,6 +55,7 @@ def _get_default_secondary_uom(self):
     def _get_uom_line(self):
         return self[self._secondary_unit_fields["uom_field"]]
 
+    # TODO: This method is now not used in this module. Deprecate it in future.
     def _get_factor_line(self):
         uom_line = self._get_uom_line()
         return self.secondary_uom_id.factor * (
@@ -72,6 +73,19 @@ def _get_secondary_uom_qty_depends(self):
             return []
         return [self._secondary_unit_fields["qty_field"]]
 
+    @api.model
+    def _convert_qty_to_secondary_uom(self, qty):
+        # Intended to be called from other operations if needed.
+        self.ensure_one()
+        uom_line = self._get_uom_line()
+        uom_product = self.product_id[self._product_uom_field]
+        if uom_line != uom_product:
+            qty = uom_line._compute_quantity(qty, uom_product)
+        return float_round(
+            qty / (self.secondary_uom_id.factor or 1.0),
+            precision_rounding=self.secondary_uom_id.uom_id.rounding,
+        )
+
     @api.depends(lambda x: x._get_secondary_uom_qty_depends())
     def _compute_secondary_uom_qty(self):
         for line in self:
@@ -80,13 +94,8 @@ def _compute_secondary_uom_qty(self):
                 continue
             elif line.secondary_uom_id.dependency_type == "independent":
                 continue
-            factor = line._get_factor_line()
             qty_line = line._get_quantity_from_line()
-            qty = float_round(
-                qty_line / (factor or 1.0),
-                precision_rounding=line.secondary_uom_id.uom_id.rounding,
-            )
-            line.secondary_uom_qty = qty
+            line.secondary_uom_qty = line._convert_qty_to_secondary_uom(qty_line)
 
     def _get_default_value_for_qty_field(self):
         return self.default_get([self._secondary_unit_fields["qty_field"]]).get(
@@ -114,12 +123,11 @@ def _compute_helper_target_field_qty(self):
             rec.env.remove_to_compute(
                 field=rec._fields["secondary_uom_qty"], records=rec
             )
-            factor = rec._get_factor_line()
-            qty = float_round(
-                rec.secondary_uom_qty * factor,
-                precision_rounding=rec._get_uom_line().rounding,
-            )
-            rec[rec._secondary_unit_fields["qty_field"]] = qty
+            qty_base = rec.secondary_uom_qty * rec.secondary_uom_id.factor
+            uom_line = rec._get_uom_line()
+            uom_product = rec.product_id[rec._product_uom_field]
+            qty_line = uom_product._compute_quantity(qty_base, uom_line)
+            rec[rec._secondary_unit_fields["qty_field"]] = qty_line
 
     def _onchange_helper_product_uom_for_secondary(self):
         """Helper method to be called from onchange method of uom field in
@@ -130,13 +138,8 @@ def _onchange_helper_product_uom_for_secondary(self):
             return
         elif self.secondary_uom_id.dependency_type == "independent":
             return
-        factor = self._get_factor_line()
-        line_qty = self._get_quantity_from_line()
-        qty = float_round(
-            line_qty / (factor or 1.0),
-            precision_rounding=self.secondary_uom_id.uom_id.rounding,
-        )
-        self.secondary_uom_qty = qty
+        qty_line = self._get_quantity_from_line()
+        self.secondary_uom_qty = self._convert_qty_to_secondary_uom(qty_line)
 
     @api.model
     def default_get(self, fields_list):
diff --git a/product_secondary_unit/tests/test_secondary_unit_mixin.py b/product_secondary_unit/tests/test_secondary_unit_mixin.py
index 79427234eaa..44e61510d02 100644
--- a/product_secondary_unit/tests/test_secondary_unit_mixin.py
+++ b/product_secondary_unit/tests/test_secondary_unit_mixin.py
@@ -15,14 +15,13 @@ def setUpClass(cls):
         from .models import SecondaryUnitFake
 
         cls.loader.update_registry((SecondaryUnitFake,))
-        cls.product_uom_kg = cls.env.ref("uom.product_uom_kgm")
         cls.product_uom_unit = cls.env.ref("uom.product_uom_unit")
         cls.product_uom_dozen = cls.env.ref("uom.product_uom_dozen")
         cls.product_template = cls.env["product.template"].create(
             {
                 "name": "test",
-                "uom_id": cls.product_uom_kg.id,
-                "uom_po_id": cls.product_uom_kg.id,
+                "uom_id": cls.product_uom_unit.id,
+                "uom_po_id": cls.product_uom_unit.id,
                 "secondary_uom_ids": [
                     Command.create(
                         {
@@ -151,3 +150,44 @@ def test_independent_type(self):
         fake_model.write({"secondary_uom_qty": 4})
         self.assertEqual(fake_model.product_uom_qty, 17)
         self.assertEqual(fake_model.secondary_uom_qty, 4)
+
+    def test_secondary_uom_qty_conversion_with_different_line_uom(self):
+        product_uom_litre = self.env.ref("uom.product_uom_litre")
+        volume_category = self.env.ref("uom.product_uom_categ_vol")
+        product_uom_millilitre = self.env["uom.uom"].create(
+            {
+                "name": "mL",
+                "category_id": volume_category.id,
+                "uom_type": "smaller",
+                "factor": 1000.0,
+                "rounding": 0.01,
+            }
+        )
+        product_template = self.env["product.template"].create(
+            {
+                "name": "Test",
+                "uom_id": product_uom_millilitre.id,
+                "uom_po_id": product_uom_millilitre.id,
+                "secondary_uom_ids": [
+                    Command.create(
+                        {
+                            "name": "Bottle",
+                            "uom_id": product_uom_millilitre.id,
+                            "factor": 1200.0,
+                            "dependency_type": "dependent",
+                        }
+                    )
+                ],
+            }
+        )
+        bottle_secondary_uom = product_template.secondary_uom_ids
+        fake_model = self.env["secondary.unit.fake"].create(
+            {
+                "name": "Secondary unit fake (volume)",
+                "product_id": product_template.product_variant_ids.id,
+                "product_uom_id": product_uom_litre.id,
+                "product_uom_qty": 1.2,
+                "secondary_uom_id": bottle_secondary_uom.id,
+            }
+        )
+        self.assertEqual(fake_model.secondary_uom_qty, 1.0)

From fe33d3556492de32ab4d60a2a53800160769bcd3 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Mon, 16 Feb 2026 11:16:09 +0000
Subject: [PATCH 54/58] [BOT] post-merge updates

---
 product_secondary_unit/README.rst                    | 2 +-
 product_secondary_unit/__manifest__.py               | 2 +-
 product_secondary_unit/static/description/index.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/product_secondary_unit/README.rst b/product_secondary_unit/README.rst
index 6923954aa09..efc6bfa2aaa 100644
--- a/product_secondary_unit/README.rst
+++ b/product_secondary_unit/README.rst
@@ -11,7 +11,7 @@ Product Secondary Unit
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:7c3631b2bfcbf6b7a703fcf35191a858aa0cb2b95ac103597c58663e10a9d49b
+   !! source digest: sha256:4ece400aee08c0178ff656081f07fa4f180c2d365e2a82302b56d3a4424096c4
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index 7af44ebf5ef..7c024e14b57 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Product Secondary Unit",
     "summary": "Set a secondary unit per product",
-    "version": "18.0.1.1.0",
+    "version": "18.0.2.0.0",
     "development_status": "Production/Stable",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
diff --git a/product_secondary_unit/static/description/index.html b/product_secondary_unit/static/description/index.html
index c617ae3fe4e..5f2e4e06282 100644
--- a/product_secondary_unit/static/description/index.html
+++ b/product_secondary_unit/static/description/index.html
@@ -372,7 +372,7 @@ <h1>Product Secondary Unit</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:7c3631b2bfcbf6b7a703fcf35191a858aa0cb2b95ac103597c58663e10a9d49b
+!! source digest: sha256:4ece400aee08c0178ff656081f07fa4f180c2d365e2a82302b56d3a4424096c4
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.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/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/product-attribute/tree/18.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/product-attribute-18-0/product-attribute-18-0-product_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/product-attribute&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 extends the functionality of product module to allow define

From 8509596cf8dc28ab3f28a5ce23f9c8fdff69629e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Fri, 20 Feb 2026 15:39:49 +0100
Subject: [PATCH 55/58] [IMP] product_secondary_unit: Change where the mock has
 to be loaded

With the changes introduced in odoo/odoo@de056cc#diff-b37c7fd5520c97a29ddc59495779e7be61a66e15e85603928e27b3affb9dc31f, an error was occurring because the change validation on the model was being performed before tearDownClass was executed. Therefore, it has been modified so that the mock changes are applied in each test and cleaned up after each test. This way, the error will no longer appear and the test will run normally.
---
 .../tests/test_secondary_unit_mixin.py        | 46 +++++++++----------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/product_secondary_unit/tests/test_secondary_unit_mixin.py b/product_secondary_unit/tests/test_secondary_unit_mixin.py
index 44e61510d02..0ece7b8ff8c 100644
--- a/product_secondary_unit/tests/test_secondary_unit_mixin.py
+++ b/product_secondary_unit/tests/test_secondary_unit_mixin.py
@@ -7,27 +7,26 @@
 
 
 class TestProductSecondaryUnitMixin(TransactionCase, FakeModelLoader):
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.loader = FakeModelLoader(cls.env, cls.__module__)
-        cls.loader.backup_registry()
+    def setUp(self):
+        super().setUp()
+        self.loader = FakeModelLoader(self.env, self.__module__)
+        self.loader.backup_registry()
         from .models import SecondaryUnitFake
 
-        cls.loader.update_registry((SecondaryUnitFake,))
-        cls.product_uom_unit = cls.env.ref("uom.product_uom_unit")
-        cls.product_uom_dozen = cls.env.ref("uom.product_uom_dozen")
-        cls.product_template = cls.env["product.template"].create(
+        self.loader.update_registry((SecondaryUnitFake,))
+        self.product_uom_unit = self.env.ref("uom.product_uom_unit")
+        self.product_uom_dozen = self.env.ref("uom.product_uom_dozen")
+        self.product_template = self.env["product.template"].create(
             {
                 "name": "test",
-                "uom_id": cls.product_uom_unit.id,
-                "uom_po_id": cls.product_uom_unit.id,
+                "uom_id": self.product_uom_unit.id,
+                "uom_po_id": self.product_uom_unit.id,
                 "secondary_uom_ids": [
                     Command.create(
                         {
                             "code": "C5",
                             "name": "box 5",
-                            "uom_id": cls.product_uom_unit.id,
+                            "uom_id": self.product_uom_unit.id,
                             "factor": 5,
                         }
                     ),
@@ -35,7 +34,7 @@ def setUpClass(cls):
                         {
                             "code": "C10",
                             "name": "box 10",
-                            "uom_id": cls.product_uom_unit.id,
+                            "uom_id": self.product_uom_unit.id,
                             "factor": 10,
                         }
                     ),
@@ -44,29 +43,28 @@ def setUpClass(cls):
                             "code": "C20",
                             "name": "box 20",
                             "dependency_type": "independent",
-                            "uom_id": cls.product_uom_unit.id,
+                            "uom_id": self.product_uom_unit.id,
                             "factor": 20,
                         }
                     ),
                 ],
             }
         )
-        cls.secondary_unit_box_5 = cls.product_template.secondary_uom_ids[0]
-        cls.secondary_unit_box_10 = cls.product_template.secondary_uom_ids[1]
-        cls.secondary_unit_box_20 = cls.product_template.secondary_uom_ids[2]
+        self.secondary_unit_box_5 = self.product_template.secondary_uom_ids[0]
+        self.secondary_unit_box_10 = self.product_template.secondary_uom_ids[1]
+        self.secondary_unit_box_20 = self.product_template.secondary_uom_ids[2]
         # Fake model which inherit from
-        cls.secondary_unit_fake = cls.env["secondary.unit.fake"].create(
+        self.secondary_unit_fake = self.env["secondary.unit.fake"].create(
             {
                 "name": "Secondary unit fake",
-                "product_id": cls.product_template.product_variant_ids.id,
-                "product_uom_id": cls.product_uom_unit.id,
+                "product_id": self.product_template.product_variant_ids.id,
+                "product_uom_id": self.product_uom_unit.id,
             }
         )
 
-    @classmethod
-    def tearDownClass(cls):
-        cls.loader.restore_registry()
-        return super().tearDownClass()
+    def tearDown(self):
+        self.loader.restore_registry()
+        return super().tearDown()
 
     def test_product_secondary_unit_mixin(self):
         fake_model = self.secondary_unit_fake

From f162039aa4b8d859188563f7c286a9ffac1936b1 Mon Sep 17 00:00:00 2001
From: OCA-git-bot <oca-git-bot@odoo-community.org>
Date: Fri, 20 Feb 2026 17:13:08 +0000
Subject: [PATCH 56/58] [BOT] post-merge updates

---
 product_secondary_unit/README.rst                    | 2 +-
 product_secondary_unit/__manifest__.py               | 2 +-
 product_secondary_unit/static/description/index.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/product_secondary_unit/README.rst b/product_secondary_unit/README.rst
index efc6bfa2aaa..01d90c5a4af 100644
--- a/product_secondary_unit/README.rst
+++ b/product_secondary_unit/README.rst
@@ -11,7 +11,7 @@ Product Secondary Unit
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:4ece400aee08c0178ff656081f07fa4f180c2d365e2a82302b56d3a4424096c4
+   !! source digest: sha256:63ed715c2b6f80cfa91b5f6bd1aa5bfdd21b625fd49ae9aa646fc9825a4054d5
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index 7c024e14b57..5224dbf1d5c 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Product Secondary Unit",
     "summary": "Set a secondary unit per product",
-    "version": "18.0.2.0.0",
+    "version": "18.0.2.0.1",
     "development_status": "Production/Stable",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
diff --git a/product_secondary_unit/static/description/index.html b/product_secondary_unit/static/description/index.html
index 5f2e4e06282..88435e8768b 100644
--- a/product_secondary_unit/static/description/index.html
+++ b/product_secondary_unit/static/description/index.html
@@ -372,7 +372,7 @@ <h1>Product Secondary Unit</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:4ece400aee08c0178ff656081f07fa4f180c2d365e2a82302b56d3a4424096c4
+!! source digest: sha256:63ed715c2b6f80cfa91b5f6bd1aa5bfdd21b625fd49ae9aa646fc9825a4054d5
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.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/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/product-attribute/tree/18.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/product-attribute-18-0/product-attribute-18-0-product_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/product-attribute&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 extends the functionality of product module to allow define

From 806c69ab95a852cc5543d834a78c6732f7180d7e Mon Sep 17 00:00:00 2001
From: Jochen De Bie <jochen.debie@dynapps.be>
Date: Wed, 25 Feb 2026 11:28:12 +0100
Subject: [PATCH 57/58] [IMP] product_secondary_unit: pre-commit stuff

---
 product_secondary_unit/README.rst             | 20 +++++++++----------
 product_secondary_unit/__manifest__.py        |  2 +-
 .../models/product_secondary_unit_mixin.py    |  2 +-
 .../static/description/index.html             |  6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/product_secondary_unit/README.rst b/product_secondary_unit/README.rst
index 01d90c5a4af..8f4eb765460 100644
--- a/product_secondary_unit/README.rst
+++ b/product_secondary_unit/README.rst
@@ -21,13 +21,13 @@ Product 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%2Fproduct--attribute-lightgray.png?logo=github
-    :target: https://github.com/OCA/product-attribute/tree/18.0/product_secondary_unit
+    :target: https://github.com/OCA/product-attribute/tree/19.0/product_secondary_unit
     :alt: OCA/product-attribute
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/product-attribute-18-0/product-attribute-18-0-product_secondary_unit
+    :target: https://translation.odoo-community.org/projects/product-attribute-19-0/product-attribute-19-0-product_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/product-attribute&target_branch=18.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/product-attribute&target_branch=19.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -55,7 +55,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/product-attribute/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/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2019.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.
 
@@ -70,11 +70,11 @@ Authors
 Contributors
 ------------
 
-- Carlos Dauden <carlos.dauden@tecnativa.com>
-- Sergio Teruel <sergio.teruel@tecnativa.com>
-- Kitti Upariphutthiphong <kittiu@ecosoft.co.th>
-- Pimolnat Suntian <pimolnats@ecosoft.co.th>
-- Alan Ramos <alan.ramos@jarsa.com.mx>
+-  Carlos Dauden <carlos.dauden@tecnativa.com>
+-  Sergio Teruel <sergio.teruel@tecnativa.com>
+-  Kitti Upariphutthiphong <kittiu@ecosoft.co.th>
+-  Pimolnat Suntian <pimolnats@ecosoft.co.th>
+-  Alan Ramos <alan.ramos@jarsa.com.mx>
 
 Maintainers
 -----------
@@ -97,6 +97,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-sergio-teruel| 
 
-This module is part of the `OCA/product-attribute <https://github.com/OCA/product-attribute/tree/18.0/product_secondary_unit>`_ project on GitHub.
+This module is part of the `OCA/product-attribute <https://github.com/OCA/product-attribute/tree/19.0/product_secondary_unit>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/product_secondary_unit/__manifest__.py b/product_secondary_unit/__manifest__.py
index 5224dbf1d5c..7c2156c6045 100644
--- a/product_secondary_unit/__manifest__.py
+++ b/product_secondary_unit/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Product Secondary Unit",
     "summary": "Set a secondary unit per product",
-    "version": "18.0.2.0.1",
+    "version": "19.0.1.0.0",
     "development_status": "Production/Stable",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
diff --git a/product_secondary_unit/models/product_secondary_unit_mixin.py b/product_secondary_unit/models/product_secondary_unit_mixin.py
index 7129d152ce5..3bb7ac91f73 100644
--- a/product_secondary_unit/models/product_secondary_unit_mixin.py
+++ b/product_secondary_unit/models/product_secondary_unit_mixin.py
@@ -49,7 +49,7 @@ def _get_default_secondary_uom(self):
         comodel_name="product.secondary.unit",
         string="Second unit",
         ondelete="restrict",
-        default=_get_default_secondary_uom,
+        default=lambda self: self._get_default_secondary_uom(),
     )
 
     def _get_uom_line(self):
diff --git a/product_secondary_unit/static/description/index.html b/product_secondary_unit/static/description/index.html
index 88435e8768b..14c515729ef 100644
--- a/product_secondary_unit/static/description/index.html
+++ b/product_secondary_unit/static/description/index.html
@@ -374,7 +374,7 @@ <h1>Product Secondary Unit</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:63ed715c2b6f80cfa91b5f6bd1aa5bfdd21b625fd49ae9aa646fc9825a4054d5
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.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/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/product-attribute/tree/18.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/product-attribute-18-0/product-attribute-18-0-product_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/product-attribute&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><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.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/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/product-attribute/tree/19.0/product_secondary_unit"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/product-attribute-19-0/product-attribute-19-0-product_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/product-attribute&amp;target_branch=19.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 product module to allow define
 other units with their conversion factor.</p>
 <p><strong>Table of contents</strong></p>
@@ -404,7 +404,7 @@ <h2><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/product-attribute/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/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2018.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/product-attribute/issues/new?body=module:%20product_secondary_unit%0Aversion:%2019.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">
@@ -436,7 +436,7 @@ <h3><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h3>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external image-reference" href="https://github.com/sergio-teruel"><img alt="sergio-teruel" src="https://github.com/sergio-teruel.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/product-attribute/tree/18.0/product_secondary_unit">OCA/product-attribute</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/product-attribute/tree/19.0/product_secondary_unit">OCA/product-attribute</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>

From 84882191d7bdcea1bb49e2960492c22f07d630dd Mon Sep 17 00:00:00 2001
From: Jochen De Bie <jochen.debie@dynapps.be>
Date: Wed, 25 Feb 2026 13:00:47 +0100
Subject: [PATCH 58/58] [MIG] product_secondary_unit: Migration to 19.0

---
 .../tests/test_product_second_unit.py         |  6 +-
 .../tests/test_secondary_unit_mixin.py        | 66 ++++++++-----------
 2 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/product_secondary_unit/tests/test_product_second_unit.py b/product_secondary_unit/tests/test_product_second_unit.py
index c038b1bcfa5..de225864a91 100644
--- a/product_secondary_unit/tests/test_product_second_unit.py
+++ b/product_secondary_unit/tests/test_product_second_unit.py
@@ -19,7 +19,6 @@ def setUpClass(cls):
             {
                 "name": "test",
                 "uom_id": cls.product_uom_kg.id,
-                "uom_po_id": cls.product_uom_kg.id,
                 "secondary_uom_ids": [
                     Command.create(
                         {
@@ -45,7 +44,6 @@ def setUpClass(cls):
                 "name": "Piece of woods",
                 "list_price": 2000,
                 "uom_id": cls.product_uom_kg.id,
-                "uom_po_id": cls.product_uom_kg.id,
                 "secondary_uom_ids": [
                     Command.create(
                         {
@@ -111,7 +109,7 @@ def test_product_secondary_unit_search(self):
                 self.product.product_variant_ids.ids,
             )
         ]
-        results = self.env["product.secondary.unit"].name_search(name="A", args=args)
+        results = self.env["product.secondary.unit"].name_search(name="A", domain=args)
         self.assertEqual(len(results), 1)
         self.assertEqual(
             results[0][1],
@@ -120,7 +118,7 @@ def test_product_secondary_unit_search(self):
             .sudo()
             .display_name,
         )
-        results = self.env["product.secondary.unit"].name_search(name="X", args=args)
+        results = self.env["product.secondary.unit"].name_search(name="X", domain=args)
         self.assertEqual(len(results), 0)
 
     def test_multi_variant_product_secondary_unit(self):
diff --git a/product_secondary_unit/tests/test_secondary_unit_mixin.py b/product_secondary_unit/tests/test_secondary_unit_mixin.py
index 0ece7b8ff8c..03e2bb0b839 100644
--- a/product_secondary_unit/tests/test_secondary_unit_mixin.py
+++ b/product_secondary_unit/tests/test_secondary_unit_mixin.py
@@ -1,32 +1,38 @@
 # Copyright 2021 Tecnativa - Sergio Teruel
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-from odoo_test_helper import FakeModelLoader
-
 from odoo.fields import Command
+from odoo.orm.model_classes import add_to_registry
 from odoo.tests import TransactionCase
 
 
-class TestProductSecondaryUnitMixin(TransactionCase, FakeModelLoader):
-    def setUp(self):
-        super().setUp()
-        self.loader = FakeModelLoader(self.env, self.__module__)
-        self.loader.backup_registry()
+class TestProductSecondaryUnitMixin(TransactionCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
         from .models import SecondaryUnitFake
 
-        self.loader.update_registry((SecondaryUnitFake,))
-        self.product_uom_unit = self.env.ref("uom.product_uom_unit")
-        self.product_uom_dozen = self.env.ref("uom.product_uom_dozen")
-        self.product_template = self.env["product.template"].create(
+        add_to_registry(cls.registry, SecondaryUnitFake)
+        cls.registry._setup_models__(cls.env.cr, ["secondary.unit.fake"])
+        cls.registry.init_models(
+            cls.env.cr,
+            model_names=["secondary.unit.fake"],
+            context={"models_to_check": True},
+        )
+        cls.addClassCleanup(cls.registry.__delitem__, "secondary.unit.fake")
+
+        cls.product_uom_unit = cls.env.ref("uom.product_uom_unit")
+        cls.product_uom_dozen = cls.env.ref("uom.product_uom_dozen")
+        cls.product_template = cls.env["product.template"].create(
             {
                 "name": "test",
-                "uom_id": self.product_uom_unit.id,
-                "uom_po_id": self.product_uom_unit.id,
+                "uom_id": cls.product_uom_unit.id,
                 "secondary_uom_ids": [
                     Command.create(
                         {
                             "code": "C5",
                             "name": "box 5",
-                            "uom_id": self.product_uom_unit.id,
+                            "uom_id": cls.product_uom_unit.id,
                             "factor": 5,
                         }
                     ),
@@ -34,7 +40,7 @@ def setUp(self):
                         {
                             "code": "C10",
                             "name": "box 10",
-                            "uom_id": self.product_uom_unit.id,
+                            "uom_id": cls.product_uom_unit.id,
                             "factor": 10,
                         }
                     ),
@@ -43,29 +49,25 @@ def setUp(self):
                             "code": "C20",
                             "name": "box 20",
                             "dependency_type": "independent",
-                            "uom_id": self.product_uom_unit.id,
+                            "uom_id": cls.product_uom_unit.id,
                             "factor": 20,
                         }
                     ),
                 ],
             }
         )
-        self.secondary_unit_box_5 = self.product_template.secondary_uom_ids[0]
-        self.secondary_unit_box_10 = self.product_template.secondary_uom_ids[1]
-        self.secondary_unit_box_20 = self.product_template.secondary_uom_ids[2]
+        cls.secondary_unit_box_5 = cls.product_template.secondary_uom_ids[0]
+        cls.secondary_unit_box_10 = cls.product_template.secondary_uom_ids[1]
+        cls.secondary_unit_box_20 = cls.product_template.secondary_uom_ids[2]
         # Fake model which inherit from
-        self.secondary_unit_fake = self.env["secondary.unit.fake"].create(
+        cls.secondary_unit_fake = cls.env["secondary.unit.fake"].create(
             {
                 "name": "Secondary unit fake",
-                "product_id": self.product_template.product_variant_ids.id,
-                "product_uom_id": self.product_uom_unit.id,
+                "product_id": cls.product_template.product_variant_ids.id,
+                "product_uom_id": cls.product_uom_unit.id,
             }
         )
 
-    def tearDown(self):
-        self.loader.restore_registry()
-        return super().tearDown()
-
     def test_product_secondary_unit_mixin(self):
         fake_model = self.secondary_unit_fake
 
@@ -151,21 +153,11 @@ def test_independent_type(self):
 
     def test_secondary_uom_qty_conversion_with_different_line_uom(self):
         product_uom_litre = self.env.ref("uom.product_uom_litre")
-        volume_category = self.env.ref("uom.product_uom_categ_vol")
-        product_uom_millilitre = self.env["uom.uom"].create(
-            {
-                "name": "mL",
-                "category_id": volume_category.id,
-                "uom_type": "smaller",
-                "factor": 1000.0,
-                "rounding": 0.01,
-            }
-        )
+        product_uom_millilitre = self.env.ref("uom.product_uom_milliliter")
         product_template = self.env["product.template"].create(
             {
                 "name": "Test",
                 "uom_id": product_uom_millilitre.id,
-                "uom_po_id": product_uom_millilitre.id,
                 "secondary_uom_ids": [
                     Command.create(
                         {