Browse Source

[FIX] Bug Fixed 'Recurring payment'

pull/134/merge
Ajmalcybrosys 6 years ago
parent
commit
25069386b2
  1. 2
      base_accounting_kit/__manifest__.py
  2. 5
      base_accounting_kit/doc/RELEASE_NOTES.md
  3. 30
      base_accounting_kit/wizard/recurring_payments.py
  4. 3
      base_accounting_kit/wizard/recurring_payments_wizard.xml

2
base_accounting_kit/__manifest__.py

@ -22,7 +22,7 @@
{ {
'name': 'Odoo 13 Full Accounting Kit', 'name': 'Odoo 13 Full Accounting Kit',
'version': '13.0.1.2.1', 'version': '13.0.1.3.1',
'category': 'Accounting', 'category': 'Accounting',
'summary': """ This Module will bring back the accounting features such 'summary': """ This Module will bring back the accounting features such
Asset Management, Budget Management, Accounting Reports, Asset Management, Budget Management, Accounting Reports,

5
base_accounting_kit/doc/RELEASE_NOTES.md

@ -14,3 +14,8 @@
#### Version 13.0.1.2.1 #### Version 13.0.1.2.1
#### ADD #### ADD
- Added Budget Management. - Added Budget Management.
#### 31.10.2019
#### Version 13.0.1.3.1
#### FIX
- Bug Fixed 'Recurring paymenst'

30
base_accounting_kit/wizard/recurring_payments.py

@ -35,6 +35,12 @@ class RecurringPaymentsWizard(models.TransientModel):
recurring_tmpl_ids = fields.Many2many('account.recurring.payments', recurring_tmpl_ids = fields.Many2many('account.recurring.payments',
string='Recurring Template') string='Recurring Template')
@api.model
def default_get(self, fields):
result = super(RecurringPaymentsWizard, self).default_get(fields)
self.get_remaining_entries()
return result
@api.onchange('date_from', 'recurring_tmpl_ids') @api.onchange('date_from', 'recurring_tmpl_ids')
def get_remaining_entries(self): def get_remaining_entries(self):
if self.date_from: if self.date_from:
@ -95,33 +101,31 @@ class RecurringPaymentsWizard(models.TransientModel):
if not data: if not data:
raise UserError(_("There is no remaining payments")) raise UserError(_("There is no remaining payments"))
for line in data: for line in data:
this = line.tmpl_id tmpl_id = line.tmpl_id
recurr_code = str(this.id) + '/' + str(line.date) recurr_code = str(tmpl_id.id) + '/' + str(line.date)
line_ids = [(0, 0, { line_ids = [(0, 0, {
'account_id': this.credit_account.id, 'account_id': tmpl_id.credit_account.id,
'partner_id': this.partner_id.id, 'partner_id': tmpl_id.partner_id.id,
'credit': line.amount, 'credit': line.amount,
'analytic_account_id': this.analytic_account_id.id, 'analytic_account_id': tmpl_id.analytic_account_id.id,
'narration': 'Recurring entry of "%s"' % this.name,
}), (0, 0, { }), (0, 0, {
'account_id': this.debit_account.id, 'account_id': tmpl_id.debit_account.id,
'partner_id': this.partner_id.id, 'partner_id': tmpl_id.partner_id.id,
'debit': line.amount, 'debit': line.amount,
'analytic_account_id': this.analytic_account_id.id, 'analytic_account_id': tmpl_id.analytic_account_id.id,
'narration': 'Recurring entry of "%s"' % this.name,
})] })]
vals = { vals = {
'date': line.date, 'date': line.date,
'recurring_ref': recurr_code, 'recurring_ref': recurr_code,
'company_id': self.env.user.company_id.id, 'company_id': self.env.user.company_id.id,
'journal_id': this.journal_id.id, 'journal_id': tmpl_id.journal_id.id,
'is_active': True,
'ref': line.template_name, 'ref': line.template_name,
'narration': 'Recurring entry',
'line_ids': line_ids 'line_ids': line_ids
} }
move_id = self.env['account.move'].create(vals) move_id = self.env['account.move'].create(vals)
if this.journal_state == 'posted': if tmpl_id.journal_state == 'posted':
move_id.post() move_id.post()

3
base_accounting_kit/wizard/recurring_payments_wizard.xml

@ -8,6 +8,9 @@
<field name="model">recurring.payments.wizard</field> <field name="model">recurring.payments.wizard</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Generate Payments"> <form string="Generate Payments">
<div class="text-muted">
Only recurring templates which are in the running stage will be considered.
</div>
<group> <group>
<group> <group>
<field name="date_from"/> <field name="date_from"/>

Loading…
Cancel
Save