Browse Source

dons : generate recurring 2 1:00

master
root 3 years ago
parent
commit
af009dee54
2 changed files with 11 additions and 12 deletions
  1. +10
    -10
      models/donation.py
  2. +1
    -2
      views/donation.xml

+ 10
- 10
models/donation.py View File

@ -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)


+ 1
- 2
views/donation.xml View File

@ -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')]}"/>


Loading…
Cancel
Save