diff --git a/product/ERP5/tests/testAccountingReports.py b/product/ERP5/tests/testAccountingReports.py
index 8a0f4e3e5dd1bc5e1e6e8001c160265c9e77fe05..8f16fb33917f68a3a45ab2b36afeabb39313a4fb 100644
--- a/product/ERP5/tests/testAccountingReports.py
+++ b/product/ERP5/tests/testAccountingReports.py
@@ -154,6 +154,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['simulation_state'] = ['delivered']
     
     report_section_list = self.getReportSectionList(
+                               self.portal.accounting_module,
                                'AccountingTransactionModule_viewJournalReport')
     self.assertEquals(1, len(report_section_list))
     
@@ -317,6 +318,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['payment'] = bank1.getRelativeUrl()
     
     report_section_list = self.getReportSectionList(
+                               self.portal.accounting_module,
                                'AccountingTransactionModule_viewJournalReport')
     self.assertEquals(1, len(report_section_list))
     
@@ -531,6 +533,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['simulation_state'] = ['delivered']
     
     report_section_list = self.getReportSectionList(
+                               self.portal.accounting_module,
                                'AccountModule_viewAccountStatementReport')
     self.assertEquals(1, len(report_section_list))
     
@@ -629,6 +632,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['simulation_state'] = ['delivered']
     
     report_section_list = self.getReportSectionList(
+                               self.portal.accounting_module,
                                'AccountModule_viewAccountStatementReport')
     self.assertEquals(1, len(report_section_list))
     line_list = self.getListBoxLineList(report_section_list[0])
@@ -700,6 +704,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['simulation_state'] = ['delivered']
     
     report_section_list = self.getReportSectionList(
+                               self.portal.accounting_module,
                                'AccountModule_viewAccountStatementReport')
     self.assertEquals(1, len(report_section_list))
     line_list = self.getListBoxLineList(report_section_list[0])
@@ -804,6 +809,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['detailed_from_date_summary'] = 1
     
     report_section_list = self.getReportSectionList(
+                               self.portal.accounting_module,
                                'AccountModule_viewAccountStatementReport')
     # the report has 4 sections, 
     self.assertEquals(4, len(report_section_list))
@@ -875,6 +881,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['simulation_state'] = ['delivered']
     
     report_section_list = self.getReportSectionList(
+                               self.portal.accounting_module,
                                'AccountModule_viewAccountStatementReport')
     self.assertEquals(1, len(report_section_list))
     
@@ -935,6 +942,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['simulation_state'] = ['delivered']
     
     report_section_list = self.getReportSectionList(
+                               self.portal.accounting_module,
                                'AccountModule_viewAccountStatementReport')
     self.assertEquals(1, len(report_section_list))
     
@@ -993,6 +1001,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['simulation_state'] = ['delivered']
     
     report_section_list = self.getReportSectionList(
+                               self.portal.accounting_module,
                                'AccountModule_viewAccountStatementReport')
     self.assertEquals(1, len(report_section_list))
     
@@ -1046,6 +1055,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['simulation_state'] = ['delivered']
     
     report_section_list = self.getReportSectionList(
+                               self.portal.accounting_module,
                                'AccountModule_viewAccountStatementReport')
     self.assertEquals(1, len(report_section_list))
     
@@ -1090,6 +1100,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['simulation_state'] = ['delivered']
     
     report_section_list = self.getReportSectionList(
+                                    self.portal.accounting_module,
                                     'AccountModule_viewAccountStatementReport')
     self.assertEquals(1, len(report_section_list))
     line_list = self.getListBoxLineList(report_section_list[0])
@@ -1122,6 +1133,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['simulation_state'] = ['stopped', 'confirmed']
 
     report_section_list = self.getReportSectionList(
+                                    self.portal.accounting_module,
                                     'AccountModule_viewAccountStatementReport')
     self.assertEquals(1, len(report_section_list))
     line_list = self.getListBoxLineList(report_section_list[0])
@@ -1157,6 +1169,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['per_account_class_summary'] = 0
 
     report_section_list = self.getReportSectionList(
+                                    self.portal.accounting_module,
                                     'AccountModule_viewTrialBalanceReport')
     self.assertEquals(1, len(report_section_list))
     line_list = self.getListBoxLineList(report_section_list[0])
@@ -1254,6 +1267,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['per_account_class_summary'] = 0
 
     report_section_list = self.getReportSectionList(
+                                    self.portal.accounting_module,
                                     'AccountModule_viewTrialBalanceReport')
     self.assertEquals(1, len(report_section_list))
     line_list = self.getListBoxLineList(report_section_list[0])
@@ -1365,6 +1379,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['per_account_class_summary'] = 0
 
     report_section_list = self.getReportSectionList(
+                                    self.portal.accounting_module,
                                     'AccountModule_viewTrialBalanceReport')
     self.assertEquals(1, len(report_section_list))
     line_list = self.getListBoxLineList(report_section_list[0])
@@ -1448,6 +1463,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['per_account_class_summary'] = 0
 
     report_section_list = self.getReportSectionList(
+                                    self.portal.accounting_module,
                                     'AccountModule_viewTrialBalanceReport')
     self.assertEquals(1, len(report_section_list))
     line_list = self.getListBoxLineList(report_section_list[0])
@@ -1511,6 +1527,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['per_account_class_summary'] = 0
 
     report_section_list = self.getReportSectionList(
+                                    self.portal.accounting_module,
                                     'AccountModule_viewTrialBalanceReport')
     self.assertEquals(1, len(report_section_list))
     line_list = self.getListBoxLineList(report_section_list[0])
@@ -1589,6 +1606,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['per_account_class_summary'] = 0
 
     report_section_list = self.getReportSectionList(
+                                    self.portal.accounting_module,
                                     'AccountModule_viewTrialBalanceReport')
     self.assertEquals(1, len(report_section_list))
     line_list = self.getListBoxLineList(report_section_list[0])
@@ -1655,6 +1673,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['per_account_class_summary'] = 0
 
     report_section_list = self.getReportSectionList(
+                                    self.portal.accounting_module,
                                     'AccountModule_viewTrialBalanceReport')
     self.assertEquals(1, len(report_section_list))
     line_list = self.getListBoxLineList(report_section_list[0])
@@ -1733,6 +1752,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['per_account_class_summary'] = 0
 
     report_section_list = self.getReportSectionList(
+                                    self.portal.accounting_module,
                                     'AccountModule_viewTrialBalanceReport')
     self.assertEquals(1, len(report_section_list))
     line_list = self.getListBoxLineList(report_section_list[0])
@@ -1799,6 +1819,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['per_account_class_summary'] = 0
 
     report_section_list = self.getReportSectionList(
+                                    self.portal.accounting_module,
                                     'AccountModule_viewTrialBalanceReport')
     self.assertEquals(1, len(report_section_list))
     line_list = self.getListBoxLineList(report_section_list[0])
@@ -1869,6 +1890,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['per_account_class_summary'] = 0
 
     report_section_list = self.getReportSectionList(
+                                    self.portal.accounting_module,
                                     'AccountModule_viewTrialBalanceReport')
     self.assertEquals(1, len(report_section_list))
     line_list = self.getListBoxLineList(report_section_list[0])
@@ -1910,6 +1932,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['per_account_class_summary'] = 0
 
     report_section_list = self.getReportSectionList(
+                                    self.portal.accounting_module,
                                     'AccountModule_viewTrialBalanceReport')
     self.assertEquals(1, len(report_section_list))
     line_list = self.getListBoxLineList(report_section_list[0])
@@ -1986,6 +2009,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['per_account_class_summary'] = 1
 
     report_section_list = self.getReportSectionList(
+                                    self.portal.accounting_module,
                                     'AccountModule_viewTrialBalanceReport')
     self.assertEquals(1, len(report_section_list))
     line_list = self.getListBoxLineList(report_section_list[0])
@@ -2034,6 +2058,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     request_form['simulation_state'] = ['delivered']
 
     report_section_list = self.getReportSectionList(
+                                    self.portal.accounting_module,
                                     'AccountModule_viewGeneralLedgerReport')
     self.assertEquals(6, len(report_section_list))
 
diff --git a/product/ERP5/tests/testCrmReports.py b/product/ERP5/tests/testCrmReports.py
index 82f356334671e9832234d0370f4175f5e934415b..41f7b1c3a433fdb57f3c1581197e7970468c9954 100644
--- a/product/ERP5/tests/testCrmReports.py
+++ b/product/ERP5/tests/testCrmReports.py
@@ -374,6 +374,7 @@ class TestCrmReports(CrmTestCase):
     request_form['validation_state'] = ['validated',]
     
     report_section_list = self.getReportSectionList(
+                               self.portal.campaign_module,
                                'CampaignModule_viewCampaignStatusReport')
     self.assertEquals(1, len(report_section_list))
         
@@ -521,6 +522,7 @@ class TestCrmReports(CrmTestCase):
     request_form['validation_state'] = ['validated',]
     
     report_section_list = self.getReportSectionList(
+                               self.portal.campaign_module,
                                'CampaignModule_viewCampaignDetailedReport')
     self.assertEquals(2, len(report_section_list))
         
@@ -684,6 +686,7 @@ class TestCrmReports(CrmTestCase):
     request_form['validation_state'] = ['validated',]
     
     report_section_list = self.getReportSectionList(
+                               self.portal.meeting_module,
                                'MeetingModule_viewMeetingStatusReport')
     self.assertEquals(1, len(report_section_list))
         
@@ -829,6 +832,7 @@ class TestCrmReports(CrmTestCase):
     request_form['validation_state'] = ['validated',]
     
     report_section_list = self.getReportSectionList(
+                               self.portal.meeting_module,
                                'MeetingModule_viewMeetingDetailedReport')
     self.assertEquals(2, len(report_section_list))
         
@@ -992,6 +996,7 @@ class TestCrmReports(CrmTestCase):
     request_form['validation_state'] = ['validated',]
     
     report_section_list = self.getReportSectionList(
+                        self.portal.support_request_module,
                         'SupportRequestModule_viewSupportRequestStatusReport')
     self.assertEquals(1, len(report_section_list))
         
@@ -1137,6 +1142,7 @@ class TestCrmReports(CrmTestCase):
     request_form['validation_state'] = ['validated',]
     
     report_section_list = self.getReportSectionList(
+                      self.portal.support_request_module,
                       'SupportRequestModule_viewSupportRequestDetailedReport')
     self.assertEquals(2, len(report_section_list))
         
@@ -1300,6 +1306,7 @@ class TestCrmReports(CrmTestCase):
     request_form['sale_opportunity_state'] = ['contacted','offered']
     
     report_section_list = self.getReportSectionList(
+                      self.portal.sale_opportunity_module,
                       'SaleOpportunityModule_viewSaleOpportunityStatusReport')
     self.assertEquals(1, len(report_section_list))
         
@@ -1445,6 +1452,7 @@ class TestCrmReports(CrmTestCase):
     request_form['sale_opportunity_state'] = ['contacted','offered']
     
     report_section_list = self.getReportSectionList(
+                     self.portal.sale_opportunity_module,
                     'SaleOpportunityModule_viewSaleOpportunityDetailedReport')
     self.assertEquals(2, len(report_section_list))
         
@@ -1701,6 +1709,7 @@ class TestCrmReports(CrmTestCase):
     request_form['from_date'] = DateTime(2007, 1, 1)
     
     report_section_list = self.getReportSectionList(
+                                    self.portal.event_module,
                                     'EventModule_viewEventActivityReport')
     #Obtain 2 listbox with outgoing and incoming events
     self.assertEquals(2, len(report_section_list))
@@ -2043,6 +2052,7 @@ class TestCrmReports(CrmTestCase):
     request_form['from_date'] = DateTime(2007, 1, 1)
     
     report_section_list = self.getReportSectionList(
+                                    self.portal.event_module,
                                     'EventModule_viewEventDetailedReport')
     #Obtain 1 listbox with outgoing and incoming events
     self.assertEquals(1, len(report_section_list))
diff --git a/product/ERP5/tests/testPayroll.py b/product/ERP5/tests/testPayroll.py
index 75fdcb20cfeafdb3558e9deaf6511bcd156ecdaf..d1a5a25ef7327fd8a5bd9712c6899af868533288 100644
--- a/product/ERP5/tests/testPayroll.py
+++ b/product/ERP5/tests/testPayroll.py
@@ -1663,6 +1663,7 @@ class TestPayroll(TestPayrollMixin):
     request_form['mirror_section'] = provider.getRelativeUrl()
     
     report_section_list = self.getReportSectionList(
+                             self.portal.accounting_module,
                              'AccountingTransactionModule_viewPaySheetLineReport')
     self.assertEquals(1, len(report_section_list))
       
@@ -1851,6 +1852,7 @@ class TestPayroll(TestPayrollMixin):
     request_form['mirror_section'] = provider.getRelativeUrl()
     
     report_section_list = self.getReportSectionList(
+                             self.portal.accounting_module,
                              'AccountingTransactionModule_viewPaySheetLineReport')
     self.assertEquals(1, len(report_section_list))