audrius/account-financial-tools
1
0
Fork 0
mirror of https://github.com/OCA/account-financial-tools.git synced 2025-02-02 12:47:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix net amount, using amount_residual instead of debit-credit

Browse Source
This commit is contained in:
Kitti U
2019-05-29 15:34:01 +07:00
committed by Alexis de Lattre
parent 9944ecb9e6
commit ec38da63ea
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
account_netting/wizards/account_move_make_netting.py
View File

@@ -54,8 +54,10 @@ class AccountMoveMakeNetting(models.TransientModel):
"be the same for all.")) "be the same for all."))
res = super(AccountMoveMakeNetting, self).default_get(fields_list) res = super(AccountMoveMakeNetting, self).default_get(fields_list)
res['move_line_ids'] = [(6, 0, move_lines.ids)] res['move_line_ids'] = [(6, 0, move_lines.ids)]
balance = (sum(move_lines.mapped('debit')) - debit_move_lines_debit = move_lines.filtered('debit')
sum(move_lines.mapped('credit'))) credit_move_lines_debit = move_lines.filtered('credit')
balance = (abs(sum(debit_move_lines_debit.mapped('amount_residual'))) -
abs(sum(credit_move_lines_debit.mapped('amount_residual'))))
res['balance'] = abs(balance) res['balance'] = abs(balance)
res['balance_type'] = 'pay' if balance < 0 else 'receive' res['balance_type'] = 'pay' if balance < 0 else 'receive'
return res return res
@@ -70,7 +72,7 @@ class AccountMoveMakeNetting(models.TransientModel):
# Group amounts by account # Group amounts by account
account_groups = self.move_line_ids.read_group( account_groups = self.move_line_ids.read_group(
[('id', 'in', self.move_line_ids.ids)], [('id', 'in', self.move_line_ids.ids)],
['account_id', 'debit', 'credit'], ['account_id', 'amount_residual'],
['account_id'], ['account_id'],
) )
debtors = [] debtors = []
@@ -78,7 +80,7 @@ class AccountMoveMakeNetting(models.TransientModel):
total_debtors = 0 total_debtors = 0
total_creditors = 0 total_creditors = 0
for account_group in account_groups: for account_group in account_groups:
balance = account_group['debit'] - account_group['credit'] balance = account_group['amount_residual']
group_vals = { group_vals = {
'account_id': account_group['account_id'][0], 'account_id': account_group['account_id'][0],
'balance': abs(balance), 'balance': abs(balance),