Browse Source

divers

master
root 3 years ago
parent
commit
f6a325c2d1
5 changed files with 9 additions and 7 deletions
  1. +2
    -2
      models/donation.py
  2. +2
    -1
      models/duplicate.py
  3. +2
    -2
      models/partner.py
  4. +1
    -0
      views/duplicate.xml
  5. +2
    -2
      views/recurring_donation.xml

+ 2
- 2
models/donation.py View File

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


+ 2
- 1
models/duplicate.py View File

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


+ 2
- 2
models/partner.py View File

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


+ 1
- 0
views/duplicate.xml View File

@ -20,6 +20,7 @@
<field name="arch" type="xml">
<tree>
<field name="partner_id"/>
<field name="user_ids"/>
</tree>
</field>


+ 2
- 2
views/recurring_donation.xml View File

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


Loading…
Cancel
Save