diff --git a/models/donation.py b/models/donation.py index 0b3d2ed..96e6165 100644 --- a/models/donation.py +++ b/models/donation.py @@ -51,7 +51,11 @@ class DonationDonation(models.Model): default='monthly' ) - + payment_batch_id = fields.Many2one( + 'opendons_payment_batch', + string='Payment Batch', + ondelete='set null' + ) @api.onchange('operation_id') def _onchange_operation_id(self): @@ -65,11 +69,7 @@ class DonationDonation(models.Model): # self.donation_date=fields.Date.context_today(self) # return True - # payment_batch_id = fields.Many2one( - # 'opendons_payment_batch', - # string='Payment Batch', - # ondelete='set null' - # ) + # def _compute_rum(self): # for rec in self: diff --git a/models/payment_batch.py b/models/payment_batch.py index dcd8314..96fe5b8 100644 --- a/models/payment_batch.py +++ b/models/payment_batch.py @@ -8,7 +8,20 @@ class opendons_payment_batch(models.Model): _name = 'opendons_payment_batch' _description = 'manage payment batch' - payment_mode=fields.Selection([('check', 'Check'),('credit card', 'Credit Card'),('pa', 'Prélèvement automatique') ],'Payment mode', default='check', required=True) + company_id = fields.Many2one( + "res.company", + string="Company", + ondelete="cascade", + default=lambda self: self.env.company, + ) + payment_mode_id = fields.Many2one( + "account.payment.mode", + string="Payment Mode", + domain="[('company_id', '=', company_id), ('donation', '=', True)]", + copy=False, + tracking=True + + ) # product_id=fields.Many2one( @@ -25,6 +38,7 @@ class opendons_payment_batch(models.Model): string='Operation', index=True, + domain=[('state', '=', 'exported')], track_visibility='onchange', ondelete='restrict' ) @@ -37,11 +51,11 @@ class opendons_payment_batch(models.Model): ondelete='restrict' ) - # donation_ids = fields.One2many( - # 'donation.donation', - # 'payment_batch_id', - # string='donation', - # track_visibility='onchange') + donation_ids = fields.One2many( + 'donation.donation', + 'payment_batch_id', + string='donation', + track_visibility='onchange') payment_count=fields.Integer(string='payments count', readonly=True) @@ -52,7 +66,12 @@ class opendons_payment_batch(models.Model): # 'payment_batch_id', # string='Payment lines', # 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 + def action_ajouter_payment(self): return True diff --git a/views/payment_batch.xml b/views/payment_batch.xml index 7b40162..c59f7ca 100644 --- a/views/payment_batch.xml +++ b/views/payment_batch.xml @@ -7,7 +7,7 @@ - + @@ -26,13 +26,17 @@ - + + +