[tryton-commits] changeset in modules/purchase_request_quotation:default Provide ...

[Cédric Krier]

changeset a9c0af17b9a6 in modules/purchase_request_quotation:default
details: 
https://hg.tryton.org/modules/purchase_request_quotation?cmd=changeset&node=a9c0af17b9a6
description:
        Provide digits from unit of measure

        issue10677
        review365801002
diffstat:

 purchase.py    |  12 +-----------
 quotation.fodt |   2 +-
 2 files changed, 2 insertions(+), 12 deletions(-)

diffs (48 lines):

diff -r 17f38278e82f -r a9c0af17b9a6 purchase.py
--- a/purchase.py       Sat Aug 21 09:09:56 2021 +0200
+++ b/purchase.py       Mon Aug 30 00:27:13 2021 +0200
@@ -272,9 +272,7 @@
             'required': ~Eval('product')
             },
         depends=['product'])
-    quantity = fields.Float(
-        'Quantity', digits=(16, Eval('unit_digits', 2)), required=True,
-        depends=['unit_digits'])
+    quantity = fields.Float("Quantity", digits='unit', required=True)
     unit = fields.Many2One(
         'product.uom', 'Unit', ondelete='RESTRICT',
         states={
@@ -286,8 +284,6 @@
                 ('category', '!=', -1)),
         ],
         depends=['product', 'product_uom_category'])
-    unit_digits = fields.Function(
-        fields.Integer('Unit Digits'), 'on_change_with_unit_digits')
     product_uom_category = fields.Function(
         fields.Many2One('product.uom.category', 'Product Uom Category'),
         'on_change_with_product_uom_category')
@@ -354,12 +350,6 @@
                 self.currency = self.request.company.currency
             self.supply_date = self.request.supply_date or datetime.date.max
 
-    @fields.depends('unit')
-    def on_change_with_unit_digits(self, name=None):
-        if self.unit:
-            return self.unit.digits
-        return None
-
     @fields.depends('product')
     def on_change_with_product_uom_category(self, name=None):
         if self.product:
diff -r 17f38278e82f -r a9c0af17b9a6 quotation.fodt
--- a/quotation.fodt    Sat Aug 21 09:09:56 2021 +0200
+++ b/quotation.fodt    Mon Aug 30 00:27:13 2021 +0200
@@ -689,7 +689,7 @@
       <text:p text:style-name="P26"><text:placeholder 
text:placeholder-type="text">&lt;/for&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau1.A3" 
office:value-type="string">
-      <text:p text:style-name="P17"><text:placeholder 
text:placeholder-type="text">&lt;(format_number(quotation_line.quantity, 
quotation.supplier.lang, digits=quotation_line.unit_digits) + 
(quotation_line.unit and (&apos; &apos; + quotation_line.unit.symbol) or 
&apos;&apos;)) or &apos;&apos;&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P17"><text:placeholder 
text:placeholder-type="text">&lt;(format_number(quotation_line.quantity, 
quotation.supplier.lang, digits=quotation_line.unit.digits if 
quotation_line.unit else None) + (quotation_line.unit and (&apos; &apos; + 
quotation_line.unit.symbol) or &apos;&apos;)) or 
&apos;&apos;&gt;</text:placeholder></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau1.A3" 
office:value-type="string">
       <text:p text:style-name="P17"><text:placeholder 
text:placeholder-type="text">&lt;format_currency(quotation_line.unit_price, 
quotation.supplier.lang, quotation_line.currency, 
digits=quotation_line.__class__.unit_price.digits[1]) if 
quotation_line.unit_price else &quot;&quot;&gt;</text:placeholder></text:p>