diff --git a/modules/purchase_trade/purchase.py b/modules/purchase_trade/purchase.py
index 97dd076..e71cca7 100755
--- a/modules/purchase_trade/purchase.py
+++ b/modules/purchase_trade/purchase.py
@@ -859,7 +859,7 @@ class ContractClause(ModelSQL, ModelView):
language = fields.Char("Language")
source = fields.Char("Source")
text = fields.Text("Text", required=True)
- incoterm = fields.Many2One('incoterm.incoterm', "Incoterm")
+ incoterm_code = fields.Char("Incoterm")
product = fields.Many2One('product.product', "Product")
payment_term = fields.Many2One(
'account.invoice.payment_term', "Payment Term")
@@ -893,9 +893,9 @@ class ContractClause(ModelSQL, ModelView):
def matches_contract(self, contract, direction):
if self.direction not in ('both', direction):
return False
- if (self.incoterm
- and getattr(getattr(contract, 'incoterm', None), 'id', None)
- != self.incoterm.id):
+ if (self.incoterm_code
+ and getattr(getattr(contract, 'incoterm', None), 'code', None)
+ != self.incoterm_code):
return False
if (self.payment_term
and getattr(getattr(contract, 'payment_term', None), 'id', None)
@@ -929,7 +929,7 @@ class ContractTemplate(ModelSQL, ModelView):
('sale', 'Sale'),
], "Direction", required=True)
active = fields.Boolean("Active")
- incoterm = fields.Many2One('incoterm.incoterm', "Incoterm")
+ incoterm_code = fields.Char("Incoterm")
product = fields.Many2One('product.product', "Product")
payment_term = fields.Many2One(
'account.invoice.payment_term', "Payment Term")
@@ -959,9 +959,9 @@ class ContractTemplate(ModelSQL, ModelView):
def matches_contract(self, contract, direction):
if self.direction not in ('both', direction):
return False
- if (self.incoterm
- and getattr(getattr(contract, 'incoterm', None), 'id', None)
- != self.incoterm.id):
+ if (self.incoterm_code
+ and getattr(getattr(contract, 'incoterm', None), 'code', None)
+ != self.incoterm_code):
return False
if (self.payment_term
and getattr(getattr(contract, 'payment_term', None), 'id', None)
diff --git a/modules/purchase_trade/view/contract_clause_form.xml b/modules/purchase_trade/view/contract_clause_form.xml
index 7dc0b6a..cd64223 100644
--- a/modules/purchase_trade/view/contract_clause_form.xml
+++ b/modules/purchase_trade/view/contract_clause_form.xml
@@ -15,8 +15,8 @@
-
-
+
+
diff --git a/modules/purchase_trade/view/contract_clause_tree.xml b/modules/purchase_trade/view/contract_clause_tree.xml
index d2ebc4f..163f59d 100644
--- a/modules/purchase_trade/view/contract_clause_tree.xml
+++ b/modules/purchase_trade/view/contract_clause_tree.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/modules/purchase_trade/view/contract_template_form.xml b/modules/purchase_trade/view/contract_template_form.xml
index cd7e5d9..13c4575 100644
--- a/modules/purchase_trade/view/contract_template_form.xml
+++ b/modules/purchase_trade/view/contract_template_form.xml
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/modules/purchase_trade/view/contract_template_tree.xml b/modules/purchase_trade/view/contract_template_tree.xml
index bf8d73f..11ea1bf 100644
--- a/modules/purchase_trade/view/contract_template_tree.xml
+++ b/modules/purchase_trade/view/contract_template_tree.xml
@@ -2,7 +2,7 @@
-
+