From 907005c50c24dab3ddcd0d331e2880be8acac5ba Mon Sep 17 00:00:00 2001
From: Raimon Esteve <raimonesteve@gmail.com>
Date: Thu, 26 Aug 2021 13:54:12 +0200
Subject: [PATCH] Use digits mixin issue10677

---
 ca.po => locale/ca.po                   |  8 ++++----
 es.po => locale/es.po                   | 14 +++++++-------
 sale.py                                 | 17 +++++++----------
 view/set_quantities_start_line_form.xml |  1 -
 view/set_quantities_start_line_list.xml |  1 -
 5 files changed, 18 insertions(+), 23 deletions(-)
 rename ca.po => locale/ca.po (95%)
 rename es.po => locale/es.po (90%)

diff --git a/ca.po b/locale/ca.po
similarity index 95%
rename from ca.po
rename to locale/ca.po
index 27c1f4e..3fe47e2 100644
--- a/ca.po
+++ b/locale/ca.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -34,9 +34,9 @@ msgctxt "field:sale_pos.set_quantities.start,total_quantity:"
 msgid "Total Quantity"
 msgstr "Quantitat total"
 
-msgctxt "field:sale_pos.set_quantities.start,unit_digits:"
-msgid "Unit Digits"
-msgstr "Dígits unitat"
+msgctxt "field:sale_pos.set_quantities.start,unit:"
+msgid "Unit"
+msgstr "Unitat"
 
 msgctxt "field:sale_pos.set_quantities.start.line,attribute_value_x:"
 msgid "Value"
diff --git a/es.po b/locale/es.po
similarity index 90%
rename from es.po
rename to locale/es.po
index 9702a49..bbea819 100644
--- a/es.po
+++ b/locale/es.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -34,9 +34,9 @@ msgctxt "field:sale_pos.set_quantities.start,total_quantity:"
 msgid "Total Quantity"
 msgstr "Cantidad total"
 
-msgctxt "field:sale_pos.set_quantities.start,unit_digits:"
-msgid "Unit Digits"
-msgstr "Dígitos unidad"
+msgctxt "field:sale_pos.set_quantities.start,unit:"
+msgid "Unit"
+msgstr "Unidad"
 
 msgctxt "field:sale_pos.set_quantities.start.line,attribute_value_x:"
 msgid "Value"
@@ -58,9 +58,9 @@ msgctxt "field:sale_pos.set_quantities.start.line,total:"
 msgid "Total"
 msgstr "Total"
 
-msgctxt "field:sale_pos.set_quantities.start.line,unit_digits:"
-msgid "Unit Digits"
-msgstr "Dígitos unidad"
+msgctxt "field:sale_pos.set_quantities.start.line,unit:"
+msgid "Unit"
+msgstr "Unidad"
 
 msgctxt "model:ir.action,name:wizard_set_quantities"
 msgid "Set Quantities"
diff --git a/sale.py b/sale.py
index 7a9349d..4ca898e 100644
--- a/sale.py
+++ b/sale.py
@@ -292,9 +292,8 @@ class SetQuantitiesStart(ModelView):
         'Quantities', size=Eval('n_lines', 0), depends=['n_lines'])
     n_lines = fields.Integer('Quantities')
     total_quantity = fields.Float('Total Quantity',
-        digits=(16, Eval('unit_digits', 2)), readonly=True,
-        depends=['unit_digits'])
-    unit_digits = fields.Integer('Unit Digits')
+        digits='unit', readonly=True)
+    unit = fields.Many2One('product.uom', 'Unit')
 
     @fields.depends('lines')
     def on_change_with_total_quantity(self):
@@ -316,11 +315,9 @@ class SetQuantitiesStartLine(ModelView):
        required=True)
     attribute_value_x = fields.Many2One('product.attribute.value', 'Value',
         required=True, readonly=True)
-    attribute_value_y = fields.Float('Quantity',
-        digits=(16, Eval('unit_digits', 2)), depends=['unit_digits'])
-    total = fields.Float('Total', digits=(16, Eval('unit_digits', 2)),
-        readonly=True, depends=['unit_digits'])
-    unit_digits = fields.Integer('Unit Digits')
+    attribute_value_y = fields.Float('Quantity', digits='unit')
+    total = fields.Float('Total', digits='unit', readonly=True)
+    unit = fields.Many2One('product.uom', 'Unit')
 
     def __setattr__(self, name, value):
         if name.startswith('attribute_value_y_'):
@@ -443,7 +440,7 @@ class SetQuantities(Wizard):
             line_vals = {
                 'attribute_value_x': attr_value_x.id,
                 'attribute_value_x.rec_name': attr_value_x.rec_name,
-                'unit_digits': template_line.unit.digits,
+                'unit': template_line.unit.id,
                 }
             line_total_quantity = 0.0
             for attr_value_y, product in list(y_values.items()):
@@ -461,7 +458,7 @@ class SetQuantities(Wizard):
             'lines': lines_vlist,
             'n_lines': len(lines_vlist),
             'total_quantity': total_quantity,
-            'unit_digits': template_line.unit.digits,
+            'unit': template_line.unit.id,
             }
 
     def transition_set_(self, *args, **kwargs):
diff --git a/view/set_quantities_start_line_form.xml b/view/set_quantities_start_line_form.xml
index 60c61d7..807cd1c 100644
--- a/view/set_quantities_start_line_form.xml
+++ b/view/set_quantities_start_line_form.xml
@@ -4,6 +4,5 @@
 <form>
     <field name="attribute_value_x"/>
     <field name="total"/>
-    <field name="unit_digits" invisible="1"/>
     <newline/>
 </form>
diff --git a/view/set_quantities_start_line_list.xml b/view/set_quantities_start_line_list.xml
index fb5c2b1..37877c2 100644
--- a/view/set_quantities_start_line_list.xml
+++ b/view/set_quantities_start_line_list.xml
@@ -4,5 +4,4 @@
 <tree editable="1">
     <field name="attribute_value_x"/>
     <field name="total"/>
-    <field name="unit_digits" tree_invisible="1"/>
 </tree>