[Erp5-report] r34348 yusuke - /erp5/trunk/products/ERP5/tests/
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Apr 8 07:42:33 CEST 2010
Author: yusuke
Date: Thu Apr 8 07:42:32 2010
New Revision: 34348
URL: http://svn.erp5.org?rev=34348&view=rev
Log:
revert r33616, r33618, r33679
Modified:
erp5/trunk/products/ERP5/tests/testAccountingReports.py
erp5/trunk/products/ERP5/tests/testAdvancedInvoicing.py
erp5/trunk/products/ERP5/tests/testERP5Simulation.py
erp5/trunk/products/ERP5/tests/testInvoice.py
Modified: erp5/trunk/products/ERP5/tests/testAccountingReports.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testAccountingReports.py?rev=34348&r1=34347&r2=34348&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testAccountingReports.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testAccountingReports.py [utf8] Thu Apr 8 07:42:32 2010
@@ -498,10 +498,6 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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, )
Modified: erp5/trunk/products/ERP5/tests/testAdvancedInvoicing.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testAdvancedInvoicing.py?rev=34348&r1=34347&r2=34348&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testAdvancedInvoicing.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testAdvancedInvoicing.py [utf8] Thu Apr 8 07:42:32 2010
@@ -901,7 +901,7 @@
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):
"""
Modified: erp5/trunk/products/ERP5/tests/testERP5Simulation.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testERP5Simulation.py?rev=34348&r1=34347&r2=34348&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testERP5Simulation.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testERP5Simulation.py [utf8] Thu Apr 8 07:42:32 2010
@@ -532,10 +532,7 @@
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()
Modified: erp5/trunk/products/ERP5/tests/testInvoice.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testInvoice.py?rev=34348&r1=34347&r2=34348&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testInvoice.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testInvoice.py [utf8] Thu Apr 8 07:42:32 2010
@@ -2568,10 +2568,6 @@
# 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 @@
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):
"""
More information about the Erp5-report
mailing list