revert r33616, r33618, r33679

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@34348 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/tests/testAccountingReports.py

@@ -498,10 +498,6 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
     else:
       bank2 = bank1
 
-    # reset ids for auto generating reference
-    self.portal.portal_ids.setLastGeneratedId(0, id_group='Accounting_Transaction_Module-Accounting_Transaction')
-    self.portal.portal_ids.setLastGeneratedId(0, id_group='Accounting_Transaction_Module-Payment_Transaction')
-
     # before
     t1 = self._makeOne(
               portal_type='Accounting Transaction',
@@ -2719,7 +2715,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
           Movement_getExplanationTitle='Transaction 1',
           date=DateTime(2006, 2, 1),
           Movement_getExplanationTranslatedPortalType='Accounting Transaction',
-          Movement_getExplanationReference='AT 1',
+          Movement_getExplanationReference=None,
           Movement_getMirrorSectionTitle='Client 1',
           debit=0, credit=100, running_total_price=-100, )
     
@@ -2728,7 +2724,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
           Movement_getExplanationTitle='Transaction 2',
           date=DateTime(2006, 2, 1, 0, 1),
           Movement_getExplanationTranslatedPortalType='Accounting Transaction',
-          Movement_getExplanationReference='AT 2',
+          Movement_getExplanationReference=None,
           Movement_getMirrorSectionTitle='Client 1',
           debit=200, credit=0, running_total_price=100, )
     
@@ -2752,7 +2748,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
           Movement_getExplanationTitle='Transaction 1',
           date=DateTime(2006, 2, 1),
           Movement_getExplanationTranslatedPortalType='Accounting Transaction',
-          Movement_getExplanationReference='AT 1',
+          Movement_getExplanationReference=None,
           Movement_getMirrorSectionTitle='Client 1',
           debit=100, credit=0, running_total_price=100, )
     
@@ -2761,7 +2757,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
           Movement_getExplanationTitle='Transaction 2',
           date=DateTime(2006, 2, 1, 0, 1),
           Movement_getExplanationTranslatedPortalType='Accounting Transaction',
-          Movement_getExplanationReference='AT 2',
+          Movement_getExplanationReference=None,
           Movement_getMirrorSectionTitle='Client 1',
           debit=0, credit=200, running_total_price=-100, )
     
@@ -2770,7 +2766,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
           Movement_getExplanationTitle='Transaction 3',
           date=DateTime(2006, 2, 2, 0, 2),
           Movement_getExplanationTranslatedPortalType='Payment Transaction',
-          Movement_getExplanationReference='PT 1',
+          Movement_getExplanationReference=None,
           Movement_getMirrorSectionTitle='Client 1',
           debit=300, credit=0, running_total_price=200, )
     
@@ -2789,7 +2785,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
           Movement_getExplanationTitle='Transaction 8',
           date=DateTime(2006, 2, 3),
           Movement_getExplanationTranslatedPortalType='Accounting Transaction',
-          Movement_getExplanationReference='AT 5',
+          Movement_getExplanationReference=None,
           Movement_getMirrorSectionTitle='Client 1',
           debit=800, credit=0, running_total_price=1600, )
     
@@ -2813,7 +2809,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
           Movement_getExplanationTitle='Transaction 4',
           date=DateTime(2006, 2, 2, 0, 3),
           Movement_getExplanationTranslatedPortalType='Payment Transaction',
-          Movement_getExplanationReference='PT 2',
+          Movement_getExplanationReference=None,
           Movement_getMirrorSectionTitle='Client 2',
           debit=400, credit=0, running_total_price=400, )
     
@@ -2830,7 +2826,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
           Movement_getExplanationTitle='Transaction 5',
           date=DateTime(2006, 2, 2, 0, 4),
           Movement_getExplanationTranslatedPortalType='Accounting Transaction',
-          Movement_getExplanationReference='AT 3',
+          Movement_getExplanationReference=None,
           Movement_getMirrorSectionTitle='John Smith',
           debit=500, credit=0, running_total_price=500, )
     
@@ -2847,7 +2843,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
           Movement_getExplanationTitle='Transaction 3',
           date=DateTime(2006, 2, 2, 0, 2),
           Movement_getExplanationTranslatedPortalType='Payment Transaction',
-          Movement_getExplanationReference='PT 1',
+          Movement_getExplanationReference=None,
           Movement_getMirrorSectionTitle='Client 1',
           debit=0, credit=300, running_total_price=-300, )
     
@@ -2856,7 +2852,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
           Movement_getExplanationTitle='Transaction 4',
           date=DateTime(2006, 2, 2, 0, 3),
           Movement_getExplanationTranslatedPortalType='Payment Transaction',
-          Movement_getExplanationReference='PT 2',
+          Movement_getExplanationReference=None,
           Movement_getMirrorSectionTitle='Client 2',
           debit=0, credit=400, running_total_price=-700, )
 
@@ -2865,7 +2861,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
           Movement_getExplanationTitle='Transaction 5',
           date=DateTime(2006, 2, 2, 0, 4),
           Movement_getExplanationTranslatedPortalType='Accounting Transaction',
-          Movement_getExplanationReference='AT 3',
+          Movement_getExplanationReference=None,
           Movement_getMirrorSectionTitle='John Smith',
           debit=0, credit=500, running_total_price=-1200, )
 
@@ -2884,7 +2880,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
           Movement_getExplanationTitle='Transaction 8',
           date=DateTime(2006, 2, 3),
           Movement_getExplanationTranslatedPortalType='Accounting Transaction',
-          Movement_getExplanationReference='AT 5',
+          Movement_getExplanationReference=None,
           Movement_getMirrorSectionTitle='Client 1',
           debit=0, credit=800, running_total_price=-2600, )
     

product/ERP5/tests/testAdvancedInvoicing.py

@@ -901,7 +901,7 @@ class TestAdvancedSaleInvoice(TestAdvancedInvoice):
     self.portal.portal_workflow.doActionFor(invoice, 'confirm_action')
 
     # We could generate a better reference here.
-    self.assertEquals('SIT 1', invoice.getReference())
+    self.assertEquals('1', invoice.getReference())
 
   def test_10_ManuallyAddedMovements(self, quiet=quiet, run=RUN_ALL_TESTS):
     """

product/ERP5/tests/testERP5Simulation.py

@@ -532,10 +532,7 @@ for failing_method in [
           expectedFailure(getattr(TestERP5SimulationPackingList, failing_method)))
         
 class TestERP5SimulationInvoice(TestERP5SimulationMixin, TestSaleInvoice):
-
-  def afterSetUp(self):
-    super(TestERP5SimulationInvoice, self).afterSetUp()
-    self.portal.portal_ids.setLastGeneratedId(0, id_group='Accounting_Transaction_Module-Sale_Invoice_Transaction')
+  pass
 
 def test_suite():
   suite = unittest.TestSuite()

product/ERP5/tests/testInvoice.py

@@ -2568,10 +2568,6 @@ class TestSaleInvoice(TestSaleInvoiceMixin, TestInvoice, ERP5TypeTestCase):
   # fix inheritance
   login = TestInvoiceMixin.login
 
-  def afterSetUp(self):
-    super(TestSaleInvoice, self).afterSetUp()
-    self.portal.portal_ids.setLastGeneratedId(0, id_group='Accounting_Transaction_Module-Sale_Invoice_Transaction')
-
   @UnrestrictedMethod
   def createCategories(self):
     TestPackingListMixin.createCategories(self)
@@ -3325,7 +3321,7 @@ class TestSaleInvoice(TestSaleInvoiceMixin, TestInvoice, ERP5TypeTestCase):
                     destination_section_value=client)
     self.portal.portal_workflow.doActionFor(invoice, 'confirm_action')
 
-    self.assertEquals('SIT 1', invoice.getReference())
+    self.assertEquals('1', invoice.getReference())
 
   def test_16_ManuallyAddedMovements(self, quiet=quiet):
     """