diff --git a/modules/purchase_trade/sale.py b/modules/purchase_trade/sale.py index 3d022d2..c29f90c 100755 --- a/modules/purchase_trade/sale.py +++ b/modules/purchase_trade/sale.py @@ -319,7 +319,7 @@ class Sale(metaclass=PoolMeta): if line.lots: nb_packing += sum([l.lot_qt for l in line.lots if l.lot_type == 'physic']) if len(line.lots)>1: - unit = line.lots[1].lot_unit_line.name + unit = line.lots[1].lot_unit.name return str(int(nb_packing)) + unit @property diff --git a/modules/sale/sale_melya.fodt b/modules/sale/sale_melya.fodt index 703ae12..4761c3b 100644 --- a/modules/sale/sale_melya.fodt +++ b/modules/sale/sale_melya.fodt @@ -1,24 +1,24 @@ - LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b62652026-03-15T12:02:29.091000000PT1H34M47S23 + LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b62652026-03-16T10:02:22.847000000PT1H36M2S25 0 0 36352 - 18404 + 18332 true false view2 - 20930 - 16946 + 17179 + 4613 0 0 36350 - 18403 + 18330 0 0 false @@ -91,7 +91,7 @@ false false false - 3124462 + 3230844 1822556 false false @@ -168,7 +168,7 @@ - + @@ -567,96 +567,99 @@ + + + - + + + + - + - - - - - - - - - - - - - + - + - + - + - + - + + + + + + + + + + + + + - + - + - + - + - + - + - - - @@ -807,6 +810,15 @@ + + + + + + + + + @@ -1715,7 +1727,7 @@ PROFORMA INVOICE Proforma Nr:Date: - <sale.report_deal><format_date(sale.sale_date, sale.party.lang) if sale.sale_date else ''> + <sale.report_deal><format_date(sale.sale_date, sale.party.lang) if sale.sale_date else ''> Buyer: @@ -1776,10 +1788,10 @@ - - Total quantity: <sale.lines[0].quantity><sale.lines[0].unit.rec_name.upper() if sale.lines and sale.lines[0].unit else ''> + + Total quantity: <sale.lines[0].quantity><sale.lines[0].unit.rec_name.upper() if sale.lines and sale.lines[0].unit else ''> - Total amount: <format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)> + Total amount: <format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)>