diff --git a/modules/account_invoice/invoice_ict.fodt b/modules/account_invoice/invoice_ict.fodt index ea4efe9..3b0fbf7 100644 --- a/modules/account_invoice/invoice_ict.fodt +++ b/modules/account_invoice/invoice_ict.fodt @@ -3901,7 +3901,7 @@ QUANTITY: <format_number(invoice.report_lbs, invoice.party.lang) if invoice.report_lbs != '' else ''>LBS (<format_number(invoice.report_net, invoice.party.lang) if invoice.report_net != '' else ''> MTS) - <invoice.report_product_description>CROP <invoice.report_crop_name> + <invoice.report_description_upper or invoice.report_product_description>CROP <invoice.report_crop_name> <invoice.report_attributes_name> <invoice.report_incoterm> @@ -4068,4 +4068,4 @@ - \ No newline at end of file + diff --git a/modules/account_invoice/invoice_ict_final.fodt b/modules/account_invoice/invoice_ict_final.fodt index abea759..50ad70f 100644 --- a/modules/account_invoice/invoice_ict_final.fodt +++ b/modules/account_invoice/invoice_ict_final.fodt @@ -3910,10 +3910,8 @@ <for each="line in invoice.lines"> <if test="line.type == 'line'"> - <if test="line.description"> - <for each="description in line.description.split('\n')"> - <description> - </for> + <if test="line.report_description_upper"> + <line.report_description_upper> </if> QUANTITY <format_number(line.report_lbs, invoice.party.lang) if line.report_lbs != '' else ''>LBS (<format_number(line.report_net, invoice.party.lang) if line.report_net != '' else ''> MTS) <line.report_product_description or line.product_name or ''>CROP <line.report_crop_name> @@ -4084,4 +4082,4 @@ - \ No newline at end of file + diff --git a/modules/purchase_trade/invoice.py b/modules/purchase_trade/invoice.py index 4aa627b..63471f8 100644 --- a/modules/purchase_trade/invoice.py +++ b/modules/purchase_trade/invoice.py @@ -101,6 +101,12 @@ class Invoice(metaclass=PoolMeta): return line.product.description or '' return '' + @property + def report_description_upper(self): + if self.lines: + return (self.lines[0].description or '').upper() + return '' + @property def report_crop_name(self): trade = self._get_report_trade() @@ -288,6 +294,10 @@ class InvoiceLine(metaclass=PoolMeta): return origin.product.description or '' return '' + @property + def report_description_upper(self): + return (self.description or '').upper() + @property def report_crop_name(self): trade = self._get_report_trade() @@ -313,4 +323,4 @@ class InvoiceLine(metaclass=PoolMeta): net = self.report_net if net == '': return '' - return Decimal(net) * Decimal('2.20462') + return round(Decimal(net) * Decimal('2204.62'),2)