diff --git a/modules/purchase/purchase.py b/modules/purchase/purchase.py
index 57ab2fd..7378967 100755
--- a/modules/purchase/purchase.py
+++ b/modules/purchase/purchase.py
@@ -462,6 +462,8 @@ class Purchase(
self.tol_min = self.party.tol_min
if self.party.tol_max:
self.tol_max = self.party.tol_max
+ if self.party.origin:
+ self.product_origin = self.party.origin
if self.party.wb:
self.wb = self.party.wb
if self.party.association:
diff --git a/modules/purchase_trade/party.py b/modules/purchase_trade/party.py
index b7bfc42..6024a54 100755
--- a/modules/purchase_trade/party.py
+++ b/modules/purchase_trade/party.py
@@ -80,6 +80,7 @@ class Party(metaclass=PoolMeta):
tol_max = fields.Numeric("Tol + in %")
wb = fields.Many2One('purchase.weight.basis',"Weight basis")
association = fields.Many2One('purchase.association',"Association")
+ origin =fields.Char("Origin")
execution = fields.One2Many('party.execution','party',"")
sla = fields.One2Many('party.execution.sla','party', "Sla")
initial = fields.Char("Initials")
diff --git a/modules/purchase_trade/view/party_form.xml b/modules/purchase_trade/view/party_form.xml
index 7df457d..fe7f3a5 100755
--- a/modules/purchase_trade/view/party_form.xml
+++ b/modules/purchase_trade/view/party_form.xml
@@ -12,6 +12,9 @@
+
+
+
diff --git a/modules/sale/sale.py b/modules/sale/sale.py
index 5d64968..440ac1e 100755
--- a/modules/sale/sale.py
+++ b/modules/sale/sale.py
@@ -508,6 +508,8 @@ class Sale(
self.tol_max = self.party.tol_max
if self.party.wb:
self.wb = self.party.wb
+ if self.party.origin:
+ self.product_origin = self.party.origin
if self.party.association:
self.association = self.party.association
if self.party.sale_invoice_method:
diff --git a/modules/sale/sale_melya.fodt b/modules/sale/sale_melya.fodt
index c37b474..379da6f 100644
--- a/modules/sale/sale_melya.fodt
+++ b/modules/sale/sale_melya.fodt
@@ -1,10 +1,10 @@
- LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b62652026-03-15T11:27:54.274000000PT1H28M29S17
+ LibreOffice/7.6.0.3$Windows_X86_64 LibreOffice_project/69edd8b8ebc41d00b4de3915dc82f8f0fc3b62652026-03-15T11:45:11.486000000PT1H33M41S20
- 2477
+ 6592
0
36352
18332
@@ -13,12 +13,12 @@
view2
- 9675
- 16999
+ 16238
+ 15161
0
- 2477
+ 6592
36350
- 20807
+ 24922
0
0
false
@@ -91,7 +91,7 @@
false
false
false
- 2596590
+ 2838212
1822556
false
false
@@ -324,7 +324,7 @@
-
+
@@ -365,47 +365,44 @@
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -414,180 +411,177 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -596,34 +590,58 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
@@ -661,98 +679,122 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1661,18 +1703,18 @@
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:
- <sale.party.rec_name>
+ <sale.party.rec_name>
<for each="line in sale.report_address.splitlines()">
<line>
</for>
-
-
+
+
@@ -1680,56 +1722,53 @@
- Quantity
+ Quantity
- Goods Description
+ Goods Description
- Unit Price
+ Unit Price
- Amount
+ Amount
-
-
-
- <sale.lines[0].quantity><sale.lines[0].unit.rec_name.upper() if sale.lines and sale.lines[0].unit else ''>
+
+
+ <sale.lines[0].quantity><sale.lines[0].unit.rec_name.upper() if sale.lines and sale.lines[0].unit else ''>
-
-
-
- <sale.lines[0].product.name if sale.lines and sale.lines[0].product else ''>
-
-
-
+
+
+ <sale.lines[0].product.name if sale.lines and sale.lines[0].product else ''>
+
+
-
-
-
- <format_currency(sale.lines[0].unit_price, sale.party.lang, sale.currency) if sale.lines else ''>
+
+
+ <format_currency(sale.lines[0].unit_price, sale.party.lang, sale.currency) if sale.lines else ''>
-
-
-
- <format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)>
+
+
+ <format_currency(sale.lines[0].amount, sale.party.lang, sale.currency)>
+ 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)>
- SHIPMENT SCHEDULE:<sale.lines[0].del_period.month_name if sale.lines and sale.lines[0].del_period else ''>
-
+ SHIPMENT SCHEDULE:<sale.lines[0].del_period.month_name if sale.lines and sale.lines[0].del_period else ''>
+
TOLERANCE:+/- <sale.tol_min>%
- ORIGIN:<sale.comment>
+ ORIGIN:<sale.product_origin>
TRANSPORTATION BY:VESSEL
@@ -1743,8 +1782,8 @@
Signed by :
(The Seller)
- MELYA SA13 RUE ROBERT CEARD CH-1204 GENEVA SWITZERLAND
-
+ MELYA SA13 RUE ROBERT CEARD CH-1204 GENEVA SWITZERLAND
+
</for>