Techsystech
/
account-reconcile
mirror of https://github.com/OCA/account-reconcile.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #632 into 16.0 

Signed-off-by bguillot
pull/647/head
OCA-git-bot 2024-04-15 13:17:30 +00:00
parent 66cd4386e8 100b51f4b3
commit ce6d7bcdb2
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
account_move_base_import/models/account_journal.py
View File

@ -143,6 +143,17 @@ class AccountJournal(models.Model):
) )
return vals_list return vals_list
def _get_global_commission_amount(self, parser):
global_commission_amount = 0.0
commmission_field = parser.commission_field
if commmission_field:
for row in parser.result_row_list:
global_commission_amount += float(row.get(commmission_field, "0.0"))
# If commission amount is positive in field, inverse the sign
if parser.commission_sign == "+":
global_commission_amount = -global_commission_amount
return global_commission_amount
def _get_extra_move_line_vals_list(self, parser, move): def _get_extra_move_line_vals_list(self, parser, move):
"""Insert extra lines after the main statement lines. """Insert extra lines after the main statement lines.
@ -156,15 +167,8 @@ class AccountJournal(models.Model):
statement ID statement ID
:param: context: global context :param: context: global context
""" """
global_commission_amount = 0
commmission_field = parser.commission_field
vals_list = [] vals_list = []
if commmission_field: global_commission_amount = self._get_global_commission_amount(parser)
for row in parser.result_row_list:
global_commission_amount += float(row.get(commmission_field, "0.0"))
# If commission amount is positive in field, inverse the sign
if parser.commission_sign == "+":
global_commission_amount = -global_commission_amount
partner_id = self.partner_id.id partner_id = self.partner_id.id
# Commission line # Commission line
if global_commission_amount > 0.0: if global_commission_amount > 0.0: