tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Provide digits from unit of measure

Browse Source 
issue10677
review365801002
This commit is contained in:
Cédric Krier
2021-08-30 00:27:13 +02:00
parent da8cf7a972
commit d190c87641
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
purchase.py
+1 -11
View File
@@ -272,9 +272,7 @@ class QuotationLine(ModelSQL, ModelView):
'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 @@ class QuotationLine(ModelSQL, ModelView):
('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 @@ class QuotationLine(ModelSQL, ModelView):
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:
quotation.fodt
+1 -1
View File
@@ -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>