Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[11.0][IMP] account_analytic_parent #208

Merged
merged 2 commits into from
Nov 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 36 additions & 4 deletions account_analytic_parent/models/account_analytic_account.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,25 @@ def _compute_debit_credit_balance(self):
of analytic account changes
"""
super(AccountAnalyticAccount, self)._compute_debit_credit_balance()
for account in self:
account.debit += sum(account.mapped("child_ids.debit"))
account.credit += sum(account.mapped("child_ids.credit"))
account.balance += sum(account.mapped("child_ids.balance"))
analytic_line_obj = self.env['account.analytic.line']
# compute only analytic line
for account in self.filtered(lambda x: x.child_ids):
domain = [('account_id', 'child_of', account.ids)]
credit_groups = analytic_line_obj.read_group(
domain=domain + [('amount', '>', 0.0)],
fields=['account_id', 'amount'],
groupby=['account_id']
)
data_credit = sum(l['amount'] for l in credit_groups)
debit_groups = analytic_line_obj.read_group(
domain=domain + [('amount', '<', 0.0)],
fields=['account_id', 'amount'],
groupby=['account_id']
)
data_debit = sum(l['amount'] for l in debit_groups)
account.debit = data_debit
account.credit = data_credit
account.balance = account.credit - account.debit

@api.multi
@api.constrains("parent_id")
Expand Down Expand Up @@ -60,3 +75,20 @@ def name_get(self):
current = current.parent_id
res.append((account.id, name))
return res

@api.multi
@api.constrains('active')
def check_parent_active(self):
for account in self:
if (account.active and account.parent_id and
account.parent_id not in self and
not account.parent_id.active):
raise UserError(
_('Please activate first parent account %s')
% account.parent_id.display_name)

@api.multi
def write(self, vals):
if self and 'active' in vals and not vals['active']:
self.mapped('child_ids').write({'active': False})
return super(AccountAnalyticAccount, self).write(vals)
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,12 @@ def test_debit_credit_balance(self):
"Analytic account in the debit side")
self.assertEqual(self.analytic_parent2.credit, 50, "Wrong amount")
self.assertEqual(self.analytic_parent2.balance, 50, "Wrong amount")

def test_archive(self):
self.analytic_parent1.toggle_active()
self.assertEqual(self.analytic_son.active, False)
self.analytic_parent1.toggle_active()
self.assertEqual(self.analytic_son.active, False)
self.analytic_parent1.toggle_active()
with self.assertRaises(ValidationError):
self.analytic_son.toggle_active()