From f6a325c2d1cf227d62e44c7a5d3b4544ce4f7123 Mon Sep 17 00:00:00 2001
From: root <raynald.candelier@gmail.com>
Date: Thu, 18 Aug 2022 08:03:54 +0200
Subject: [PATCH] divers

---
 models/donation.py           | 4 ++--
 models/duplicate.py          | 3 ++-
 models/partner.py            | 4 ++--
 views/duplicate.xml          | 1 +
 views/recurring_donation.xml | 4 ++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/models/donation.py b/models/donation.py
index 05247cf..a885175 100644
--- a/models/donation.py
+++ b/models/donation.py
@@ -23,7 +23,7 @@ class DonationDonation(models.Model):
         string='Operation',
         track_visibility='onchange',
         ondelete='restrict',
-        required=True,
+        # required=True,
         domain=[('state', '=', 'exported')]
         
     )
@@ -33,7 +33,7 @@ class DonationDonation(models.Model):
         'opendons.segment',
         string='Segment',
         track_visibility='onchange',
-        required=True,
+        # required=True,
         ondelete='restrict'
         
     )
diff --git a/models/duplicate.py b/models/duplicate.py
index 1a9d0e2..813824b 100644
--- a/models/duplicate.py
+++ b/models/duplicate.py
@@ -21,8 +21,9 @@ class opendons_duplicate_partner(models.Model):
         index=True,
         readonly=True,
         track_visibility='onchange',
-        ondelete='restrict'
+        ondelete='cascade'
     )
+    user_ids=fields.One2many(related='partner_id.user_ids')
 
     def find_duplicate_partner(self):
         self.env['opendons.duplicate_partner'].search([]).unlink()
diff --git a/models/partner.py b/models/partner.py
index dcaa5c3..1837c11 100644
--- a/models/partner.py
+++ b/models/partner.py
@@ -108,7 +108,7 @@ class partner(models.Model):
     npai_count=fields.Integer(String="NPAI count", readonly=True)
     source=fields.Char(String="source")
 
-    donor_id=fields.Char('Donor id',compute="_compute_donor_id",store=True)
+    donor_id=fields.Char('Donor id',readonly=True)
     
     aggregate_id=fields.Many2one('opendons.aggregate.partner','partner_id')
     
@@ -170,7 +170,7 @@ class partner(models.Model):
  
         # Change the values of a variable in this super function
         record['key'] = self._alpha(int(record.id))
-    
+        record.donor_id=str(record.id)+record.key
         # Return the record so that the changes are applied and everything is stored.
         return record
 
diff --git a/views/duplicate.xml b/views/duplicate.xml
index cf18260..961ba6e 100644
--- a/views/duplicate.xml
+++ b/views/duplicate.xml
@@ -20,6 +20,7 @@
       <field name="arch" type="xml">
         <tree>
           <field name="partner_id"/>
+          <field name="user_ids"/>
           
         </tree>
       </field>
diff --git a/views/recurring_donation.xml b/views/recurring_donation.xml
index 279475f..d0ff8eb 100644
--- a/views/recurring_donation.xml
+++ b/views/recurring_donation.xml
@@ -15,8 +15,8 @@
                 <field name="end_date" attrs="{'readonly':[('recurring_template','=','stopped')],'invisible':[('recurring_template','not in',('active','suspended','stopped'))]}"/>
                 <field name="stopped_date"  attrs="{'invisible':['|',('recurring_template','not in',('active','suspended','stopped')),('stopped_date','=',False)]}"/>
                 <field name="stopped_reason"  attrs="{'readonly':[('recurring_template','=','stopped')],'invisible':['|',('recurring_template','not in',('active','suspended','stopped')),('stopped_date','=',False)]}"/>
-                <field name="operation_id" attrs="{'readonly':['|',('recurring_template','=','stopped'),('state','in',['done','cancel'])]}" options="{'no_open': True, 'no_create': True}" can_create="true" can_write="true"/>
-                <field name="segment_id" attrs="{'readonly':['|',('recurring_template','=','stopped'),('state','in',['done','cancel'])]}" options="{'no_open': True, 'no_create': True}" can_create="true" can_write="true"/>
+                <field name="operation_id" attrs="{'readonly':[('recurring_template','=','stopped')]}" options="{'no_open': True, 'no_create': True}" can_create="true" can_write="true"/>
+                <field name="segment_id" attrs="{'readonly':[('recurring_template','=','stopped')]}" options="{'no_open': True, 'no_create': True}" can_create="true" can_write="true"/>
                 <field name="frequency"  attrs="{'readonly':[('recurring_template','=','stopped')],'invisible':[('recurring_template','not in',('active','suspended','stopped'))]}"/>