[MRG] from main branch

(lp:c2c-addons/6.1  rev 80.1.8)

account_financial_report_webkit/report/common_partner_reports.py

@@ -34,7 +34,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'
@@ -46,6 +48,7 @@ class CommonPartnersReportHeaderWebkit(CommonReportHeaderWebkit):
                                                     start,
                                                     stop,
                                                     target_move,
+                                                    opening_mode=opening_mode,
                                                     exclude_reconcile=exclude_reconcile,
                                                     partner_filter=partner_filter)
 

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

account_financial_report_webkit/report/partner_balance.py

@@ -71,7 +71,7 @@ class PartnerBalanceWebkit(report_sxw.rml_parse, CommonPartnerBalanceReportHeade
         OpenERP in the opening period.
 
         OpenERP allows to reconcile move lines between different partners,
-        so the generated entries in the opening period are wrong.
+        so the generated entries in the opening period are unreliable.
         """
         return 'initial_balance'
 

account_financial_report_webkit/report/partners_ledger.py

@@ -72,7 +72,7 @@ class PartnersLedgerWebkit(report_sxw.rml_parse, CommonPartnersReportHeaderWebki
         OpenERP in the opening period.
 
         OpenERP allows to reconcile move lines between different partners,
-        so the generated entries in the opening period are wrong.
+        so the generated entries in the opening period are unreliable.
         """
         return 'initial_balance'
 
@@ -183,7 +183,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: