From 500f2e1b19b5b8cee4eacb83e7c2cff7f8eaf7df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=80ngel=20=C3=80lvarez?= <angel@nan-tic.com>
Date: Mon, 10 Oct 2022 11:49:49 +0200
Subject: [PATCH 1/2] modify party/producer field on purchase contract #060223

---
 contract.py            | 8 ++++----
 view/contract_form.xml | 4 ++--
 view/contract_tree.xml | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/contract.py b/contract.py
index 31eeaba..370267b 100644
--- a/contract.py
+++ b/contract.py
@@ -42,8 +42,8 @@ class AgronomicsContract(Workflow, ModelSQL, ModelView):
         fields.Date('Start Date'), 'on_change_with_start_date')
     end_date = fields.Function(
         fields.Date('End Date'), 'on_change_with_end_date')
-    producer = fields.Many2One(
-        'party.party', "Producer", states=_STATES, depends=_DEPENDS,
+    party = fields.Many2One(
+        'party.party', "Party", states=_STATES, depends=_DEPENDS,
         required=True)
     price_list_types = fields.One2Many(
         'agronomics.contract-product.price_list.type-product.price_list',
@@ -89,7 +89,7 @@ class AgronomicsContract(Workflow, ModelSQL, ModelView):
         return 'draft'
 
     def get_rec_name(self, name):
-        ret = self.producer.rec_name
+        ret = self.party.rec_name
         if self.start_date:
             ret += ' - %s' % (self.start_date)
         return ret
@@ -153,7 +153,7 @@ class AgronomicsContractLine(ModelSQL, ModelView):
         ondelete='CASCADE')
     parcel = fields.Many2One('agronomics.parcel', "Parcel",
         domain=[
-            ('producer', '=', Eval('_parent_contract.producer')),
+            ('producer', '=', Eval('_parent_contract.party')),
             ('crop', '=', Eval('_parent_contract.crop'))
         ])
     product = fields.Function(
diff --git a/view/contract_form.xml b/view/contract_form.xml
index e5bb057..5b7f31a 100644
--- a/view/contract_form.xml
+++ b/view/contract_form.xml
@@ -5,8 +5,8 @@ this repository contains the full copyright notices and license terms. -->
     <label name="reference"/>
     <field name="reference"/>
     <newline/>
-    <label name="producer"/>
-    <field name="producer"/>
+    <label name="party"/>
+    <field name="party"/>
     <label name="crop"/>
     <field name="crop"/>
     <label name="start_date"/>
diff --git a/view/contract_tree.xml b/view/contract_tree.xml
index 7564dff..1358562 100644
--- a/view/contract_tree.xml
+++ b/view/contract_tree.xml
@@ -3,7 +3,7 @@
 this repository contains the full copyright notices and license terms. -->
 <tree>
     <field name="reference"/>
-    <field name="producer"/>
+    <field name="party"/>
     <field name="crop"/>
     <field name="start_date"/>
     <field name="end_date"/>

From c11481bfd3fe8b416bdc41284ddc3a90fb215a9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=80ngel=20=C3=80lvarez?= <angel@nan-tic.com>
Date: Tue, 11 Oct 2022 12:40:17 +0200
Subject: [PATCH 2/2] fix missing field change

---
 weighing.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weighing.py b/weighing.py
index 4957fed..29e921b 100644
--- a/weighing.py
+++ b/weighing.py
@@ -269,7 +269,7 @@ class Weighing(Workflow, ModelSQL, ModelView):
             return
         contract_lines = ContractLine.search([
             ('parcel', '=', parcel),
-            ('contract.producer', '=', producer),
+            ('contract.party', '=', producer),
             ('contract.state', '=', 'active'),
         ], limit=1)
         if not contract_lines: