From 564f6e022262b7c06864ef10dc4ba0df335f48b2 Mon Sep 17 00:00:00 2001 From: Marc Durepos Date: Tue, 28 May 2024 15:41:13 -0400 Subject: [PATCH] fix miscalculation in aged partner balance na --- aged_partner_balance_na/__init__.py | 10 +++++----- aged_partner_balance_na/models/aged_partner_balance.py | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/aged_partner_balance_na/__init__.py b/aged_partner_balance_na/__init__.py index 095b9a8..f9f04df 100644 --- a/aged_partner_balance_na/__init__.py +++ b/aged_partner_balance_na/__init__.py @@ -20,11 +20,11 @@ def post_init(env): 'availability_condition': 'always', }) col_name_mapping = [ - ('At Date', '0-29'), - ('1-30', '30-59'), - ('31-60', '60-89'), - ('61-90', '90-119'), - ('91-120', '120-159'), + ('At Date', 'Overdue'), + ('1-30', '0-29'), + ('31-60', '30-59'), + ('61-90', '60-89'), + ('91-120', '90-119'), ('Older', 'Later'), ] for old_name, new_name in col_name_mapping: diff --git a/aged_partner_balance_na/models/aged_partner_balance.py b/aged_partner_balance_na/models/aged_partner_balance.py index e3bb751..5095991 100644 --- a/aged_partner_balance_na/models/aged_partner_balance.py +++ b/aged_partner_balance_na/models/aged_partner_balance.py @@ -51,10 +51,14 @@ class AgedPartnerBalanceCustomHandler(models.AbstractModel): report._check_groupby_fields((next_groupby.split(',') if next_groupby else []) + ([current_groupby] if current_groupby else [])) def plus_days(date_obj, days): + return fields.Date.to_string(date_obj + relativedelta(days=days)) + + def minus_days(date_obj, days): return fields.Date.to_string(date_obj - relativedelta(days=days)) date_to = fields.Date.from_string(options['date']['date_to']) periods = [ + (False, minus_days(date_to, 1)) (date_to, plus_days(date_to, 29)), (plus_days(date_to, 30), plus_days(date_to, 59)), (plus_days(date_to, 60), plus_days(date_to, 89)),