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

Provide digits from unit of measure

Browse Source 
issue10677
review365801002
This commit is contained in:
Cédric Krier committed 2021-08-30 00:27:13 +02:00
1 parent ef0198e864
commit d670844da8
2 files changed
+6 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

sale.fodt
+1 -1
View File
@@ -620,7 +620,7 @@
<text:p text:style-name="P21"><text:placeholder text:placeholder-type="text">&lt;/if&gt;</text:placeholder></text:p>
</table:table-cell>
<table:table-cell table:style-name="Table1.D5" office:value-type="string">
<text:p text:style-name="P12"><text:placeholder text:placeholder-type="text">&lt;(format_number(line.quantity, sale.party.lang, digits=line.unit_digits) + (line.unit and (&apos; &apos; + line.unit.symbol) or &apos;&apos;)) or &apos;&apos;&gt;</text:placeholder></text:p>
<text:p text:style-name="P12"><text:placeholder text:placeholder-type="text">&lt;(format_number(line.quantity, sale.party.lang, digits=line.unit.digits if line.unit else None) + (line.unit and (&apos; &apos; + line.unit.symbol) or &apos;&apos;)) or &apos;&apos;&gt;</text:placeholder></text:p>
</table:table-cell>
<table:table-cell table:style-name="Table1.D5" office:value-type="string">
<text:p text:style-name="P13"><text:placeholder text:placeholder-type="text">&lt;format_currency(line.unit_price, sale.party.lang, sale.currency, digits=line.__class__.unit_price.digits[1])&gt;</text:placeholder></text:p>
sale.py
+5 -18
View File
@@ -1044,20 +1044,20 @@ class SaleLine(TaxableMixin, sequence_ordered(), ModelSQL, ModelView):
'readonly': Eval('sale_state') != 'draft',
},
depends=['sale_state'])
quantity = fields.Float('Quantity',
digits=(16, Eval('unit_digits', 2)),
quantity = fields.Float(
"Quantity", digits='unit',
states={
'invisible': Eval('type') != 'line',
'required': Eval('type') == 'line',
'readonly': Eval('sale_state') != 'draft',
},
depends=['type', 'unit_digits', 'sale_state'])
depends=['type', 'sale_state'])
actual_quantity = fields.Float(
"Actual Quantity", digits=(16, Eval('unit_digits', 2)), readonly=True,
"Actual Quantity", digits='unit', readonly=True,
states={
'invisible': Eval('type') != 'line',
},
depends=['unit_digits', 'type'])
depends=['type'])
unit = fields.Many2One('product.uom', 'Unit', ondelete='RESTRICT',
states={
'required': Bool(Eval('product')),
@@ -1070,8 +1070,6 @@ class SaleLine(TaxableMixin, sequence_ordered(), ModelSQL, ModelView):
('category', '!=', -1)),
],
depends=['product', 'type', 'product_uom_category', 'sale_state'])
unit_digits = fields.Function(fields.Integer('Unit Digits'),
'on_change_with_unit_digits')
product = fields.Many2One('product.product', 'Product',
ondelete='RESTRICT',
domain=[
@@ -1183,16 +1181,6 @@ class SaleLine(TaxableMixin, sequence_ordered(), ModelSQL, ModelView):
def default_type():
return 'line'
@staticmethod
def default_unit_digits():
return 2
@fields.depends('unit')
def on_change_with_unit_digits(self, name=None):
if self.unit:
return self.unit.digits
return 2
@property
def _move_remaining_quantity(self):
"Compute the remaining quantity to ship"
@@ -1287,7 +1275,6 @@ class SaleLine(TaxableMixin, sequence_ordered(), ModelSQL, ModelView):
category = self.product.sale_uom.category
if not self.unit or self.unit.category != category:
self.unit = self.product.sale_uom
self.unit_digits = self.product.sale_uom.digits
self.unit_price = self.compute_unit_price()