diff --git a/models/donation.py b/models/donation.py index 3fed205..278da0d 100644 --- a/models/donation.py +++ b/models/donation.py @@ -15,9 +15,12 @@ class DonationDonation(models.Model): 'opendons.operation', string='Operation', track_visibility='onchange', - ondelete='restrict' + ondelete='restrict', + domain=[('state', '=', 'exported')] ) + # operation_state= fields.Char(related='operation_id.state') + segment_id = fields.Many2one( 'opendons.segment', string='Segment', @@ -25,42 +28,47 @@ class DonationDonation(models.Model): ondelete='restrict' ) - #pour les prélèvements automatiques - rum_direct_debit = fields.Char( - 'RUM' + # #pour les prélèvements automatiques + # rum_direct_debit = fields.Char( + # 'RUM' - ) - iban_direct_debit = fields.Char( - 'iban' - ) - bic_direct_debit = fields.Char( - 'bic' - ) - start_date_direct_debit = fields.Date( - string='Start Date', - index=True, - track_visibility='onchange' - ) - end_date_direct_debit = fields.Date( - string='End Date', - index=True, - track_visibility='onchange' - ) - frequency_direct_debit =fields.Selection( - [('monthly','Monthly'), ('bimonthly','Bimonthly'),('quarterly','Quarterly'),('half-yearly','Half-yearly'),('annually','Annually')], - default='monthly' - ) + # ) + # iban_direct_debit = fields.Char( + # 'iban' + # ) + # bic_direct_debit = fields.Char( + # 'bic' + # ) + # start_date_direct_debit = fields.Date( + # string='Start Date', + # index=True, + # track_visibility='onchange' + # ) + # end_date_direct_debit = fields.Date( + # string='End Date', + # index=True, + # track_visibility='onchange' + # ) + # frequency_direct_debit =fields.Selection( + # [('monthly','Monthly'), ('bimonthly','Bimonthly'),('quarterly','Quarterly'),('half-yearly','Half-yearly'),('annually','Annually')], + # default='monthly' + # ) - sepa_status_direct_debit=fields.Selection( - [('done','Done'),('rejected','Rejected')] - ) - rejected_date_direct_debit = fields.Date( - string='rejected date', - index=True, - track_visibility='onchange' - ) + # sepa_status_direct_debit=fields.Selection( + # [('done','Done'),('rejected','Rejected')] + # ) + # rejected_date_direct_debit = fields.Date( + # string='rejected date', + # index=True, + # track_visibility='onchange' + # ) + @api.onchange('operation_id') + def _onchange_operation_id(self): + res = {} + res['domain']={'segment_id':[('operation_id', '=', self.operation_id.id)]} + return res # payment_batch_id = fields.Many2one( # 'opendons_payment_batch', diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv index 951d76a..6fe99fb 100644 --- a/security/ir.model.access.csv +++ b/security/ir.model.access.csv @@ -1,21 +1,21 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_opendons_qualifier_qualifier,opendons_qualifier.qualifier,model_opendons_qualifier_qualifier,donation_main.group_donation_manager,1,1,1,1 -access_opendons_qualifier_category,opendons_qualifier.category,model_opendons_qualifier_category,donation_main.group_donation_manager,1,1,1,1 -access_opendons_qualifier_partnerqualifier,opendons_qualifier.partnerqualifier,model_opendons_qualifier_partnerqualifier,donation_main.group_donation_manager,1,1,1,1 -access_opendons_partneraddress,opendons.partneraddress,model_opendons_partneraddress,donation_main.group_donation_manager,1,1,1,1 -access_opendons_operations,opendons.operations,model_opendons_operation,donation_main.group_donation_manager,1,1,1,1 -access_opendons_segments,opendons.segments,model_opendons_segment,donation_main.group_donation_manager,1,1,1,1 -access_opendons_ensembles,opendons.ensembles,model_opendons_ensemble,donation_main.group_donation_manager,1,1,1,1 -access_opendons_requests,opendons.requests,model_opendons_request,donation_main.group_donation_manager,1,1,1,1 +access_opendons_qualifier_qualifier,opendons_qualifier.qualifier,model_opendons_qualifier_qualifier,donation.group_donation_manager,1,1,1,1 +access_opendons_qualifier_category,opendons_qualifier.category,model_opendons_qualifier_category,donation.group_donation_manager,1,1,1,1 +access_opendons_qualifier_partnerqualifier,opendons_qualifier.partnerqualifier,model_opendons_qualifier_partnerqualifier,donation.group_donation_manager,1,1,1,1 +access_opendons_partneraddress,opendons.partneraddress,model_opendons_partneraddress,donation.group_donation_manager,1,1,1,1 +access_opendons_operations,opendons.operations,model_opendons_operation,donation.group_donation_manager,1,1,1,1 +access_opendons_segments,opendons.segments,model_opendons_segment,donation.group_donation_manager,1,1,1,1 +access_opendons_ensembles,opendons.ensembles,model_opendons_ensemble,donation.group_donation_manager,1,1,1,1 +access_opendons_requests,opendons.requests,model_opendons_request,donation.group_donation_manager,1,1,1,1 -access_opendons_relationship_partner,opendons_relationship.partner,model_opendons_relationship_partner,donation_main.group_donation_manager,1,1,1,1 -access_opendons_relationship_nature,opendons_relationship.nature,model_opendons_relationship_nature,donation_main.group_donation_manager,1,1,1,1 -access_opendons_relationship_type,opendons_relationship.type,model_opendons_relationship_type,donation_main.group_donation_manager,1,1,1,1 -access_opendons_partneremail,opendons_partneremail,model_opendons_partneremail,donation_main.group_donation_manager,1,1,1,1 -access_opendons_partnerphone,opendons_partnerphone,model_opendons_partnerphone,donation_main.group_donation_manager,1,1,1,1 +access_opendons_relationship_partner,opendons_relationship.partner,model_opendons_relationship_partner,donation.group_donation_manager,1,1,1,1 +access_opendons_relationship_nature,opendons_relationship.nature,model_opendons_relationship_nature,donation.group_donation_manager,1,1,1,1 +access_opendons_relationship_type,opendons_relationship.type,model_opendons_relationship_type,donation.group_donation_manager,1,1,1,1 +access_opendons_partneremail,opendons_partneremail,model_opendons_partneremail,donation.group_donation_manager,1,1,1,1 +access_opendons_partnerphone,opendons_partnerphone,model_opendons_partnerphone,donation.group_donation_manager,1,1,1,1 -access_opendons_returnmail,opendons_returnmail,model_opendons_returnmail,donation_main.group_donation_manager,1,1,1,1 -access_opendons_returnmailnpai,opendons_returnmailnpai,model_opendons_returnmail_npai,donation_main.group_donation_manager,1,1,1,1 +access_opendons_returnmail,opendons_returnmail,model_opendons_returnmail,donation.group_donation_manager,1,1,1,1 +access_opendons_returnmailnpai,opendons_returnmailnpai,model_opendons_returnmail_npai,donation.group_donation_manager,1,1,1,1 -access_opendons_payment_batch,opendons_payment_batch,model_opendons_payment_batch,donation_main.group_donation_manager,1,1,1,1 -access_opendons_payment_batch_lines,opendons_payment_batch_lines,model_opendons_payment_batch_lines,donation_main.group_donation_manager,1,1,1,1 +access_opendons_payment_batch,opendons_payment_batch,model_opendons_payment_batch,donation.group_donation_manager,1,1,1,1 +access_opendons_payment_batch_lines,opendons_payment_batch_lines,model_opendons_payment_batch_lines,donation.group_donation_manager,1,1,1,1 diff --git a/views/donation.xml b/views/donation.xml index 2b16572..46f780d 100644 --- a/views/donation.xml +++ b/views/donation.xml @@ -4,13 +4,13 @@ opendons.donation.form donation.donation - + - - + +