Browse Source

batch payment 00:30

master
root 3 years ago
parent
commit
f78ad84614
3 changed files with 39 additions and 15 deletions
  1. +6
    -6
      models/donation.py
  2. +26
    -7
      models/payment_batch.py
  3. +7
    -2
      views/payment_batch.xml

+ 6
- 6
models/donation.py View File

@ -51,7 +51,11 @@ class DonationDonation(models.Model):
default='monthly' default='monthly'
) )
payment_batch_id = fields.Many2one(
'opendons_payment_batch',
string='Payment Batch',
ondelete='set null'
)
@api.onchange('operation_id') @api.onchange('operation_id')
def _onchange_operation_id(self): def _onchange_operation_id(self):
@ -65,11 +69,7 @@ class DonationDonation(models.Model):
# self.donation_date=fields.Date.context_today(self) # self.donation_date=fields.Date.context_today(self)
# return True # return True
# payment_batch_id = fields.Many2one(
# 'opendons_payment_batch',
# string='Payment Batch',
# ondelete='set null'
# )
# def _compute_rum(self): # def _compute_rum(self):
# for rec in self: # for rec in self:


+ 26
- 7
models/payment_batch.py View File

@ -8,7 +8,20 @@ class opendons_payment_batch(models.Model):
_name = 'opendons_payment_batch' _name = 'opendons_payment_batch'
_description = 'manage 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( # product_id=fields.Many2one(
@ -25,6 +38,7 @@ class opendons_payment_batch(models.Model):
string='Operation', string='Operation',
index=True, index=True,
domain=[('state', '=', 'exported')],
track_visibility='onchange', track_visibility='onchange',
ondelete='restrict' ondelete='restrict'
) )
@ -37,11 +51,11 @@ class opendons_payment_batch(models.Model):
ondelete='restrict' 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) payment_count=fields.Integer(string='payments count', readonly=True)
@ -52,7 +66,12 @@ class opendons_payment_batch(models.Model):
# 'payment_batch_id', # 'payment_batch_id',
# string='Payment lines', # string='Payment lines',
# track_visibility='onchange') # 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): def action_ajouter_payment(self):
return True return True


+ 7
- 2
views/payment_batch.xml View File

@ -7,7 +7,7 @@
<tree> <tree>
<field name="create_date"/> <field name="create_date"/>
<field name="create_uid"/> <field name="create_uid"/>
<field name="payment_mode"/>
<field name="payment_mode_id"/>
</tree> </tree>
</field> </field>
@ -26,13 +26,17 @@
<field name="create_date"/> <field name="create_date"/>
<field name="create_uid"/> <field name="create_uid"/>
<field name="payment_mode"/>
<field name="payment_mode_id"/>
<field name="operation_id"/> <field name="operation_id"/>
<field name="segment_id"/> <field name="segment_id"/>
<field name="payment_input"/> <field name="payment_input"/>
<field name="company_id" invisible="1"/>
</group> </group>
<button name="action_ajouter_payment" type="object" string="Ajouter" class="oe_highlight"/> <button name="action_ajouter_payment" type="object" string="Ajouter" class="oe_highlight"/>
<field name="donation_ids"/>
@ -47,6 +51,7 @@
<field name="name">Payment batch</field> <field name="name">Payment batch</field>
<field name="res_model">opendons_payment_batch</field> <field name="res_model">opendons_payment_batch</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>


Loading…
Cancel
Save