From af009dee544318086d98a40bf5cfb9ead7ce02d9 Mon Sep 17 00:00:00 2001
From: root <raynald.candelier@gmail.com>
Date: Sun, 6 Feb 2022 17:42:16 +0000
Subject: [PATCH] dons : generate recurring 2 1:00

---
 models/donation.py | 20 ++++++++++----------
 views/donation.xml |  3 +--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/models/donation.py b/models/donation.py
index c1b3335..0b3d2ed 100644
--- a/models/donation.py
+++ b/models/donation.py
@@ -28,13 +28,6 @@ class DonationDonation(models.Model):
         
     )
     
-    start_date = fields.Date(
-        string='Start Date',
-        index=True,
-        required=True,
-        default=datetime.today(),
-        track_visibility='onchange'
-    )
     end_date = fields.Date(
         string='End Date',
         index=True,
@@ -104,27 +97,34 @@ class DonationRecurringGenerate(models.TransientModel):
         for donation in donations:
             generate=True
             existing_recur_donations = doo.search([("source_recurring_id", "=",int(donation.id))])
-
+            
+            if donation.donation_date>fields.Date.context_today(self):
+                generate=False
+                
             delta=0
             if donation.frequency=='annually':delta=365
             if donation.frequency=='half-yearly':delta=365/2
             if donation.frequency=='quarterly':delta=365/4
             if donation.frequency=='bimonthly':delta=365/6
             if donation.frequency=='monthly':delta=365/12
+            
             if existing_recur_donations:
                 for d in existing_recur_donations:
                     days_diff=(d.donation_date-fields.Date.context_today(self)).days
                     if days_diff<=delta: 
                         generate=False
                         break
-                #raise UserError("generate="+str(generate))
-
+            
+            
             if generate==True:
                 default = {
                     "recurring_template":'',
                     "donation_date": fields.Date.context_today(self),
                     "source_recurring_id": donation.id,
                     "payment_ref": '',
+                    "payment_mode_id":donation.payment_mode_id.id,
+                    "mandate_required":'True',
+                    "mandate_id":donation.mandate_id.id,
                 }
                 
                 new_donation = donation.copy(default=default)
diff --git a/views/donation.xml b/views/donation.xml
index 19a3725..ecf340d 100644
--- a/views/donation.xml
+++ b/views/donation.xml
@@ -8,8 +8,7 @@
         <field name="arch" type="xml">
             
             <xpath expr="//field[@name='donation_date']" position="replace">
-                <field name="donation_date"/>
-                <field name="start_date" options="{'datepicker': {'warn_future': false}}" attrs="{'invisible':[('recurring_template','!=','active')]}"/>
+                <field name="donation_date" string="start date"/>
                 <field name="lastexecution_date"  attrs="{'invisible':[('recurring_template','!=','active')]}"/>
                 <field name="suspended_date"  attrs="{'invisible':[('recurring_template','!=','active')]}"/>
                 <field name="end_date"  attrs="{'invisible':[('recurring_template','!=','active')]}"/>