From 1264e11b06d72be21b3e855df1f0061450c25666 Mon Sep 17 00:00:00 2001 From: Dorin Hongu Date: Fri, 25 Sep 2020 11:48:07 +0300 Subject: [PATCH 1/3] fix formatare data --- account_financial_report/report/aged_partner_balance.py | 4 ++-- account_financial_report/report/open_items.py | 6 +++--- .../report/templates/aged_partner_balance.xml | 2 +- .../report/templates/general_ledger.xml | 3 ++- account_financial_report/report/templates/open_items.xml | 4 ++-- account_financial_report/report/templates/vat_report.xml | 4 ++-- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/account_financial_report/report/aged_partner_balance.py b/account_financial_report/report/aged_partner_balance.py index 9158bfbe..7cb81b4e 100644 --- a/account_financial_report/report/aged_partner_balance.py +++ b/account_financial_report/report/aged_partner_balance.py @@ -438,8 +438,8 @@ class AgedPartnerBalanceReport(models.AbstractModel): company_id = data["company_id"] account_ids = data["account_ids"] partner_ids = data["partner_ids"] - date_at = data["date_at"] - date_at_object = datetime.strptime(date_at, "%Y-%m-%d").date() + date_at = datetime.strptime(data["date_at"], "%Y-%m-%d").date() #data["date_at"] + date_at_object = date_at # datetime.strptime(date_at, "%Y-%m-%d").date() date_from = data["date_from"] only_posted_moves = data["only_posted_moves"] show_move_line_details = data["show_move_line_details"] diff --git a/account_financial_report/report/open_items.py b/account_financial_report/report/open_items.py index 6383dbd4..9e0bffc2 100644 --- a/account_financial_report/report/open_items.py +++ b/account_financial_report/report/open_items.py @@ -353,8 +353,8 @@ class OpenItemsReport(models.AbstractModel): company_id = data["company_id"] account_ids = data["account_ids"] partner_ids = data["partner_ids"] - date_at = data["date_at"] - date_at_object = datetime.strptime(date_at, "%Y-%m-%d").date() + date_at = datetime.strptime(data["date_at"] , "%Y-%m-%d").date() # data["date_at"] + date_at_object = date_at # datetime.strptime(date_at, "%Y-%m-%d").date() date_from = data["date_from"] target_move = data["target_move"] show_partner_details = data["show_partner_details"] @@ -381,7 +381,7 @@ class OpenItemsReport(models.AbstractModel): "show_partner_details": data["show_partner_details"], "company_name": company.display_name, "currency_name": company.currency_id.name, - "date_at": date_at_object.strftime("%d/%m/%Y"), + "date_at": date_at_object, "hide_account_at_0": data["hide_account_at_0"], "target_move": data["target_move"], "journals_data": journals_data, diff --git a/account_financial_report/report/templates/aged_partner_balance.xml b/account_financial_report/report/templates/aged_partner_balance.xml index e5f4a8d1..646af7b5 100644 --- a/account_financial_report/report/templates/aged_partner_balance.xml +++ b/account_financial_report/report/templates/aged_partner_balance.xml @@ -94,7 +94,7 @@
- +
All posted entries diff --git a/account_financial_report/report/templates/general_ledger.xml b/account_financial_report/report/templates/general_ledger.xml index 5498839e..35aa8bd3 100644 --- a/account_financial_report/report/templates/general_ledger.xml +++ b/account_financial_report/report/templates/general_ledger.xml @@ -115,7 +115,8 @@
- From: To: + From: + To:
All posted entries diff --git a/account_financial_report/report/templates/open_items.xml b/account_financial_report/report/templates/open_items.xml index 30662a7d..daebb771 100644 --- a/account_financial_report/report/templates/open_items.xml +++ b/account_financial_report/report/templates/open_items.xml @@ -110,7 +110,7 @@
- +
All posted entries @@ -172,7 +172,7 @@
- +
diff --git a/account_financial_report/report/templates/vat_report.xml b/account_financial_report/report/templates/vat_report.xml index e4014e8c..064d9f69 100644 --- a/account_financial_report/report/templates/vat_report.xml +++ b/account_financial_report/report/templates/vat_report.xml @@ -179,10 +179,10 @@
- +
- +
From 02be6b7511c5dda26038cea75a03447a95fcc581 Mon Sep 17 00:00:00 2001 From: Dorin Hongu Date: Fri, 25 Sep 2020 12:11:58 +0300 Subject: [PATCH 2/3] fix formatare data --- account_financial_report/report/aged_partner_balance.py | 5 +++-- account_financial_report/report/open_items.py | 4 +++- .../report/templates/aged_partner_balance.xml | 2 +- account_financial_report/report/templates/general_ledger.xml | 4 ++-- account_financial_report/report/templates/open_items.xml | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/account_financial_report/report/aged_partner_balance.py b/account_financial_report/report/aged_partner_balance.py index 7cb81b4e..2d330802 100644 --- a/account_financial_report/report/aged_partner_balance.py +++ b/account_financial_report/report/aged_partner_balance.py @@ -438,8 +438,9 @@ class AgedPartnerBalanceReport(models.AbstractModel): company_id = data["company_id"] account_ids = data["account_ids"] partner_ids = data["partner_ids"] - date_at = datetime.strptime(data["date_at"], "%Y-%m-%d").date() #data["date_at"] - date_at_object = date_at # datetime.strptime(date_at, "%Y-%m-%d").date() + date_at = data["date_at"] + date_at = datetime.strptime(date_at, "%Y-%m-%d").date() + date_at_object = date_at date_from = data["date_from"] only_posted_moves = data["only_posted_moves"] show_move_line_details = data["show_move_line_details"] diff --git a/account_financial_report/report/open_items.py b/account_financial_report/report/open_items.py index 9e0bffc2..fb930e0c 100644 --- a/account_financial_report/report/open_items.py +++ b/account_financial_report/report/open_items.py @@ -353,7 +353,9 @@ class OpenItemsReport(models.AbstractModel): company_id = data["company_id"] account_ids = data["account_ids"] partner_ids = data["partner_ids"] - date_at = datetime.strptime(data["date_at"] , "%Y-%m-%d").date() # data["date_at"] + date_at = datetime.strptime( + data["date_at"], "%Y-%m-%d" + ).date() # data["date_at"] date_at_object = date_at # datetime.strptime(date_at, "%Y-%m-%d").date() date_from = data["date_from"] target_move = data["target_move"] diff --git a/account_financial_report/report/templates/aged_partner_balance.xml b/account_financial_report/report/templates/aged_partner_balance.xml index 646af7b5..0bbc033c 100644 --- a/account_financial_report/report/templates/aged_partner_balance.xml +++ b/account_financial_report/report/templates/aged_partner_balance.xml @@ -94,7 +94,7 @@
- +
All posted entries diff --git a/account_financial_report/report/templates/general_ledger.xml b/account_financial_report/report/templates/general_ledger.xml index 35aa8bd3..0bfa60d7 100644 --- a/account_financial_report/report/templates/general_ledger.xml +++ b/account_financial_report/report/templates/general_ledger.xml @@ -115,8 +115,8 @@
- From: - To: + From: + To:
All posted entries diff --git a/account_financial_report/report/templates/open_items.xml b/account_financial_report/report/templates/open_items.xml index daebb771..59fea2c6 100644 --- a/account_financial_report/report/templates/open_items.xml +++ b/account_financial_report/report/templates/open_items.xml @@ -110,7 +110,7 @@
- +
All posted entries @@ -172,7 +172,7 @@
- +
From b06d1538c0326f31ca304746640595cc0083ef67 Mon Sep 17 00:00:00 2001 From: Dorin Hongu Date: Fri, 25 Sep 2020 11:48:07 +0300 Subject: [PATCH 3/3] [FIX] account_financial_report: fix data format use t-options to display data fields in accordance with the country-specific format. --- account_financial_report/report/aged_partner_balance.py | 3 ++- account_financial_report/report/open_items.py | 8 +++++--- .../report/templates/aged_partner_balance.xml | 2 +- .../report/templates/general_ledger.xml | 3 ++- account_financial_report/report/templates/open_items.xml | 4 ++-- account_financial_report/report/templates/vat_report.xml | 4 ++-- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/account_financial_report/report/aged_partner_balance.py b/account_financial_report/report/aged_partner_balance.py index 9158bfbe..2d330802 100644 --- a/account_financial_report/report/aged_partner_balance.py +++ b/account_financial_report/report/aged_partner_balance.py @@ -439,7 +439,8 @@ class AgedPartnerBalanceReport(models.AbstractModel): account_ids = data["account_ids"] partner_ids = data["partner_ids"] date_at = data["date_at"] - date_at_object = datetime.strptime(date_at, "%Y-%m-%d").date() + date_at = datetime.strptime(date_at, "%Y-%m-%d").date() + date_at_object = date_at date_from = data["date_from"] only_posted_moves = data["only_posted_moves"] show_move_line_details = data["show_move_line_details"] diff --git a/account_financial_report/report/open_items.py b/account_financial_report/report/open_items.py index 6383dbd4..fb930e0c 100644 --- a/account_financial_report/report/open_items.py +++ b/account_financial_report/report/open_items.py @@ -353,8 +353,10 @@ class OpenItemsReport(models.AbstractModel): company_id = data["company_id"] account_ids = data["account_ids"] partner_ids = data["partner_ids"] - date_at = data["date_at"] - date_at_object = datetime.strptime(date_at, "%Y-%m-%d").date() + date_at = datetime.strptime( + data["date_at"], "%Y-%m-%d" + ).date() # data["date_at"] + date_at_object = date_at # datetime.strptime(date_at, "%Y-%m-%d").date() date_from = data["date_from"] target_move = data["target_move"] show_partner_details = data["show_partner_details"] @@ -381,7 +383,7 @@ class OpenItemsReport(models.AbstractModel): "show_partner_details": data["show_partner_details"], "company_name": company.display_name, "currency_name": company.currency_id.name, - "date_at": date_at_object.strftime("%d/%m/%Y"), + "date_at": date_at_object, "hide_account_at_0": data["hide_account_at_0"], "target_move": data["target_move"], "journals_data": journals_data, diff --git a/account_financial_report/report/templates/aged_partner_balance.xml b/account_financial_report/report/templates/aged_partner_balance.xml index e5f4a8d1..0bbc033c 100644 --- a/account_financial_report/report/templates/aged_partner_balance.xml +++ b/account_financial_report/report/templates/aged_partner_balance.xml @@ -94,7 +94,7 @@
- +
All posted entries diff --git a/account_financial_report/report/templates/general_ledger.xml b/account_financial_report/report/templates/general_ledger.xml index 5498839e..0bfa60d7 100644 --- a/account_financial_report/report/templates/general_ledger.xml +++ b/account_financial_report/report/templates/general_ledger.xml @@ -115,7 +115,8 @@
- From: To: + From: + To:
All posted entries diff --git a/account_financial_report/report/templates/open_items.xml b/account_financial_report/report/templates/open_items.xml index 30662a7d..59fea2c6 100644 --- a/account_financial_report/report/templates/open_items.xml +++ b/account_financial_report/report/templates/open_items.xml @@ -110,7 +110,7 @@
- +
All posted entries @@ -172,7 +172,7 @@
- +
diff --git a/account_financial_report/report/templates/vat_report.xml b/account_financial_report/report/templates/vat_report.xml index e4014e8c..064d9f69 100644 --- a/account_financial_report/report/templates/vat_report.xml +++ b/account_financial_report/report/templates/vat_report.xml @@ -179,10 +179,10 @@
- +
- +