diff --git a/modules/account_invoice/invoice_ict.fodt b/modules/account_invoice/invoice_ict.fodt
index 43b1f70..4a15179 100644
--- a/modules/account_invoice/invoice_ict.fodt
+++ b/modules/account_invoice/invoice_ict.fodt
@@ -5,16 +5,16 @@
Provisional Invoice
willen
2018-12-09T16:20:00
- 2026-03-26T18:22:40.515000000
+ 2026-03-26T20:24:09.299000000
2007-08-28T18:19:00
LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265
- PT2H56M5S
- 2
+ PT3H1M50S
+ 4
-
+
- 33995
+ 22049
0
27264
13187
@@ -23,12 +23,12 @@
view2
- 9206
- 42071
+ 11920
+ 24352
0
- 33995
+ 22049
27263
- 47181
+ 35234
0
0
false
@@ -101,7 +101,7 @@
false
false
false
- 139317
+ 147570
84510
false
false
@@ -172,7 +172,7 @@
-
+
@@ -730,13 +730,21 @@
-
+
-
+
+
+
+
+
+
+
+
+
-
+
@@ -757,6 +765,9 @@
+
+
+
@@ -3863,7 +3874,7 @@
- N° of Bill of Lading
+ N° of Bill of Lading
<invoice.reference or ''>
@@ -3900,16 +3911,11 @@
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_attributes_name>
- H.S CODE 5201.0090
+
<invoice.report_incoterm>
- ALL DETAILS AND SPECIFICATIONS AS PER BENEFICIARY’S
+ ALL DETAILS AND SPECIFICATIONS AS PER BENEFICIARY
PROFORMA INVOICE NO. <invoice.report_proforma_invoice_number>DATED <format_date(invoice.report_proforma_invoice_date, invoice.party.lang) if invoice.report_proforma_invoice_date else ''>.
-
-
-
-
-
@@ -3983,10 +3989,8 @@
FREIGHT VALUE: <invoice.currency.symbol if invoice.currency else 'USD'><format_number(invoice.freight_amount, invoice.party.lang) if hasattr(invoice, 'freight_amount') else ''>
- WE CERTIFY THAT THE MERCHANDISE IS OF BRAZIL ORIGIN
+ WE CERTIFY THAT THE MERCHANDISE IS OF <invoice.report_origin or ''>ORIGIN
L/C NUMBER <invoice.reference or ''>
- IMPORTER H.S. CODE NOS. <invoice.party_tax_identifier.type_string if invoice.party_tax_identifier else '5201.0090'>
- IMPORTER’S NTN <invoice.party_tax_identifier.code if invoice.party_tax_identifier else ''>
@@ -4009,7 +4013,7 @@
<for each="tax in invoice.taxes">
V.A.T. <tax.description or ''>RATE
- </for>
+ </for>
@@ -4072,4 +4076,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 7e80ec8..0ea65e7 100644
--- a/modules/account_invoice/invoice_ict_final.fodt
+++ b/modules/account_invoice/invoice_ict_final.fodt
@@ -5,16 +5,16 @@
Final Invoice
willen
2018-12-09T16:20:00
- 2026-03-26T19:40:52.573000000
+ 2026-03-26T20:30:59.092000000
2007-08-28T18:19:00
LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b6265
- PT3H5M31S
- 6
+ PT3H10M1S
+ 8
-
+
- 7144
+ 30868
0
27264
13187
@@ -23,12 +23,12 @@
view2
- 18336
- 26861
+ 5639
+ 34064
0
- 7144
+ 30868
27263
- 20329
+ 44053
0
0
false
@@ -101,7 +101,7 @@
false
false
false
- 336932
+ 426446
84510
false
false
@@ -172,7 +172,7 @@
-
+
@@ -729,10 +729,30 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -753,6 +773,9 @@
+
+
+
@@ -3894,27 +3917,21 @@
<for each="line in invoice.lines">
- <if test="line.type == 'line'">
- LINE <line.sequence>: 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)
+ <if test="line.type == 'line'">
+ <if test="line.description">
+ <for each="description in line.description.split('\n')">
+ <description>
+ </for>
+ </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>
<line.report_attributes_name>
- <if test="line.description">
- <for each="description in line.description.split('\n')">
- <description>
- </for>
- </if>
</if>
</for>
-
<invoice.report_incoterm>
ALL DETAILS AND SPECIFICATIONS AS PER BENEFICIARY
PROFORMA INVOICE NO. <invoice.report_proforma_invoice_number>DATED <format_date(invoice.report_proforma_invoice_date, invoice.party.lang) if invoice.report_proforma_invoice_date else ''>.
-
-
-
-
-
@@ -3984,18 +4001,16 @@
- At <format_currency(invoice.lines[0].unit_price, invoice.party.lang, invoice.currency, digits=invoice.lines[0].__class__.unit_price.digits[1]) if invoice.lines else ''>PER LB
+ At <format_currency(invoice.lines[0].unit_price, invoice.party.lang, invoice.currency, digits=invoice.lines[0].__class__.unit_price.digits[1]) if invoice.lines else ''>PER LB
FREIGHT VALUE: <invoice.currency.symbol if invoice.currency else 'USD'><format_number(invoice.freight_amount, invoice.party.lang) if hasattr(invoice, 'freight_amount') else ''>
- WE CERTIFY THAT THE MERCHANDISE IS OF BRAZIL ORIGIN
+ WE CERTIFY THAT THE MERCHANDISE IS OF <invoice.report_origin or ''>ORIGIN
L/C NUMBER <invoice.reference or ''>
- IMPORTER H.S. CODE NOS. <invoice.party_tax_identifier.type_string if invoice.party_tax_identifier else '5201.0090'>
- IMPORTER NTN <invoice.party_tax_identifier.code if invoice.party_tax_identifier else ''>
- <format_currency(invoice.total_amount, invoice.party.lang, invoice.currency)>
+ <format_currency(invoice.total_amount, invoice.party.lang, invoice.currency)>
diff --git a/modules/purchase_trade/invoice.py b/modules/purchase_trade/invoice.py
index d9b4116..dd696f7 100644
--- a/modules/purchase_trade/invoice.py
+++ b/modules/purchase_trade/invoice.py
@@ -79,6 +79,13 @@ class Invoice(metaclass=PoolMeta):
if trade and getattr(trade, 'trader', None):
return trade.trader.initial or ''
return ''
+
+ @property
+ def report_origin(self):
+ trade = self._get_report_trade()
+ if trade and getattr(trade, 'product_origin', None):
+ return trade.product_origin or ''
+ return ''
@property
def report_operator_initial(self):