From 0b9adcfc82cf724db82e6c94bb1732da970ce1ad Mon Sep 17 00:00:00 2001 From: "Guewen Baconnier @ Camptocamp" Date: Fri, 7 Sep 2012 14:39:35 +0200 Subject: [PATCH] [FIX] partner ledger, partner balance, open invoices report must all exclude the entries in the opening entries, they are always computed (lp:c2c-addons/6.1 rev 82) --- .../report/common_partner_reports.py | 7 +++++-- account_financial_report_webkit/report/open_invoices.py | 6 +++--- account_financial_report_webkit/report/partners_ledger.py | 3 ++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/account_financial_report_webkit/report/common_partner_reports.py b/account_financial_report_webkit/report/common_partner_reports.py index a6c2d8d8..d2fa7a29 100644 --- a/account_financial_report_webkit/report/common_partner_reports.py +++ b/account_financial_report_webkit/report/common_partner_reports.py @@ -32,7 +32,9 @@ class CommonPartnersReportHeaderWebkit(CommonReportHeaderWebkit): ####################Account move line retrieval helper ########################## def get_partners_move_lines_ids(self, account_id, main_filter, start, stop, target_move, - exclude_reconcile=False, partner_filter=False): + exclude_reconcile=False, + partner_filter=False, + opening_mode='exclude_opening'): filter_from = False if main_filter in ('filter_period', 'filter_no'): filter_from = 'period' @@ -44,6 +46,7 @@ class CommonPartnersReportHeaderWebkit(CommonReportHeaderWebkit): start, stop, target_move, + opening_mode=opening_mode, exclude_reconcile=exclude_reconcile, partner_filter=partner_filter) @@ -78,7 +81,7 @@ class CommonPartnersReportHeaderWebkit(CommonReportHeaderWebkit): return sql_conditions, search_params - def _get_partners_move_line_ids(self, filter_from, account_id, start, stop, target_move, opening_mode='include_opening', + def _get_partners_move_line_ids(self, filter_from, account_id, start, stop, target_move, opening_mode='exclude_opening', exclude_reconcile=False, partner_filter=False): final_res = defaultdict(list) diff --git a/account_financial_report_webkit/report/open_invoices.py b/account_financial_report_webkit/report/open_invoices.py index 118d321c..f0b3ffd3 100644 --- a/account_financial_report_webkit/report/open_invoices.py +++ b/account_financial_report_webkit/report/open_invoices.py @@ -201,15 +201,15 @@ class PartnersOpenInvoicesWebkit(report_sxw.rml_parse, CommonPartnersReportHeade for account_id in accounts_ids: initial_move_lines_ids_per_partner = initial_move_lines_per_account.get(account_id, {}) - # We get the move line ids of the account depending of the - # way the initial balance was created we include or not opening entries + # We get the move line ids of the account move_line_ids_per_partner = self.get_partners_move_lines_ids(account_id, main_filter, start, stop, target_move, exclude_reconcile=True, - partner_filter=partner_filter) + partner_filter=partner_filter, + opening_mode='exclude_opening') if not initial_move_lines_ids_per_partner and not move_line_ids_per_partner: continue diff --git a/account_financial_report_webkit/report/partners_ledger.py b/account_financial_report_webkit/report/partners_ledger.py index e534fa17..f30b512a 100644 --- a/account_financial_report_webkit/report/partners_ledger.py +++ b/account_financial_report_webkit/report/partners_ledger.py @@ -184,7 +184,8 @@ class PartnersLedgerWebkit(report_sxw.rml_parse, CommonPartnersReportHeaderWebki stop, target_move, exclude_reconcile=False, - partner_filter=partner_filter) + partner_filter=partner_filter, + opening_mode='exclude_opening') if not move_line_ids: continue for partner_id in move_line_ids: