[Erp5-report] r33616 yusuke - /erp5/trunk/products/ERP5/tests/
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Mar 11 09:03:52 CET 2010
Author: yusuke
Date: Thu Mar 11 09:03:52 2010
New Revision: 33616
URL: http://svn.erp5.org?rev=33616&view=rev
Log:
update expected references
Modified:
erp5/trunk/products/ERP5/tests/testAccountingReports.py
erp5/trunk/products/ERP5/tests/testAdvancedInvoicing.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=33616&r1=33615&r2=33616&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testAccountingReports.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testAccountingReports.py [utf8] Thu Mar 11 09:03:52 2010
@@ -494,7 +494,11 @@
bank2.validate()
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',
@@ -2683,7 +2687,7 @@
Movement_getExplanationTitle='Transaction 1',
date=DateTime(2006, 2, 1),
Movement_getExplanationTranslatedPortalType='Accounting Transaction',
- Movement_getExplanationReference=None,
+ Movement_getExplanationReference='AT 1',
Movement_getMirrorSectionTitle='Client 1',
debit=0, credit=100, running_total_price=-100, )
@@ -2692,7 +2696,7 @@
Movement_getExplanationTitle='Transaction 2',
date=DateTime(2006, 2, 1, 0, 1),
Movement_getExplanationTranslatedPortalType='Accounting Transaction',
- Movement_getExplanationReference=None,
+ Movement_getExplanationReference='AT 2',
Movement_getMirrorSectionTitle='Client 1',
debit=200, credit=0, running_total_price=100, )
@@ -2716,7 +2720,7 @@
Movement_getExplanationTitle='Transaction 1',
date=DateTime(2006, 2, 1),
Movement_getExplanationTranslatedPortalType='Accounting Transaction',
- Movement_getExplanationReference=None,
+ Movement_getExplanationReference='AT 1',
Movement_getMirrorSectionTitle='Client 1',
debit=100, credit=0, running_total_price=100, )
@@ -2725,7 +2729,7 @@
Movement_getExplanationTitle='Transaction 2',
date=DateTime(2006, 2, 1, 0, 1),
Movement_getExplanationTranslatedPortalType='Accounting Transaction',
- Movement_getExplanationReference=None,
+ Movement_getExplanationReference='AT 2',
Movement_getMirrorSectionTitle='Client 1',
debit=0, credit=200, running_total_price=-100, )
@@ -2734,7 +2738,7 @@
Movement_getExplanationTitle='Transaction 3',
date=DateTime(2006, 2, 2, 0, 2),
Movement_getExplanationTranslatedPortalType='Payment Transaction',
- Movement_getExplanationReference=None,
+ Movement_getExplanationReference='PT 1',
Movement_getMirrorSectionTitle='Client 1',
debit=300, credit=0, running_total_price=200, )
@@ -2753,7 +2757,7 @@
Movement_getExplanationTitle='Transaction 8',
date=DateTime(2006, 2, 3),
Movement_getExplanationTranslatedPortalType='Accounting Transaction',
- Movement_getExplanationReference=None,
+ Movement_getExplanationReference='AT 5',
Movement_getMirrorSectionTitle='Client 1',
debit=800, credit=0, running_total_price=1600, )
@@ -2777,7 +2781,7 @@
Movement_getExplanationTitle='Transaction 4',
date=DateTime(2006, 2, 2, 0, 3),
Movement_getExplanationTranslatedPortalType='Payment Transaction',
- Movement_getExplanationReference=None,
+ Movement_getExplanationReference='PT 2',
Movement_getMirrorSectionTitle='Client 2',
debit=400, credit=0, running_total_price=400, )
@@ -2794,7 +2798,7 @@
Movement_getExplanationTitle='Transaction 5',
date=DateTime(2006, 2, 2, 0, 4),
Movement_getExplanationTranslatedPortalType='Accounting Transaction',
- Movement_getExplanationReference=None,
+ Movement_getExplanationReference='AT 3',
Movement_getMirrorSectionTitle='John Smith',
debit=500, credit=0, running_total_price=500, )
@@ -2811,7 +2815,7 @@
Movement_getExplanationTitle='Transaction 3',
date=DateTime(2006, 2, 2, 0, 2),
Movement_getExplanationTranslatedPortalType='Payment Transaction',
- Movement_getExplanationReference=None,
+ Movement_getExplanationReference='PT 1',
Movement_getMirrorSectionTitle='Client 1',
debit=0, credit=300, running_total_price=-300, )
@@ -2820,7 +2824,7 @@
Movement_getExplanationTitle='Transaction 4',
date=DateTime(2006, 2, 2, 0, 3),
Movement_getExplanationTranslatedPortalType='Payment Transaction',
- Movement_getExplanationReference=None,
+ Movement_getExplanationReference='PT 2',
Movement_getMirrorSectionTitle='Client 2',
debit=0, credit=400, running_total_price=-700, )
@@ -2829,7 +2833,7 @@
Movement_getExplanationTitle='Transaction 5',
date=DateTime(2006, 2, 2, 0, 4),
Movement_getExplanationTranslatedPortalType='Accounting Transaction',
- Movement_getExplanationReference=None,
+ Movement_getExplanationReference='AT 3',
Movement_getMirrorSectionTitle='John Smith',
debit=0, credit=500, running_total_price=-1200, )
@@ -2848,7 +2852,7 @@
Movement_getExplanationTitle='Transaction 8',
date=DateTime(2006, 2, 3),
Movement_getExplanationTranslatedPortalType='Accounting Transaction',
- Movement_getExplanationReference=None,
+ Movement_getExplanationReference='AT 5',
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=33616&r1=33615&r2=33616&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testAdvancedInvoicing.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testAdvancedInvoicing.py [utf8] Thu Mar 11 09:03:52 2010
@@ -390,7 +390,7 @@
quiet = 1
RUN_ALL_TESTS = 1
login = TestAdvancedInvoice.login
-
+
def stepCheckInvoicesAndTransactionsConsistency(self, sequence=None, sequence_list=None,
**kw):
"""
@@ -897,7 +897,7 @@
self.portal.portal_workflow.doActionFor(invoice, 'confirm_action')
# We could generate a better reference here.
- self.assertEquals('1', invoice.getReference())
+ self.assertEquals('SIT 1', invoice.getReference())
def test_10_ManuallyAddedMovements(self, quiet=quiet, run=RUN_ALL_TESTS):
"""
Modified: erp5/trunk/products/ERP5/tests/testInvoice.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testInvoice.py?rev=33616&r1=33615&r2=33616&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testInvoice.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testInvoice.py [utf8] Thu Mar 11 09:03:52 2010
@@ -2560,6 +2560,10 @@
stepCheckNewPackingListIsPacked
"""
+ def afterSetUp(self):
+ super(TestSaleInvoiceMixin, self).afterSetUp()
+ self.portal.portal_ids.setLastGeneratedId(0, id_group='Accounting_Transaction_Module-Sale_Invoice_Transaction')
+
class TestSaleInvoice(TestSaleInvoiceMixin, TestInvoice, ERP5TypeTestCase):
"""Tests for sale invoice.
"""
@@ -3321,8 +3325,7 @@
destination_section_value=client)
self.portal.portal_workflow.doActionFor(invoice, 'confirm_action')
- # We could generate a better reference here.
- self.assertEquals('1', invoice.getReference())
+ self.assertEquals('SIT 1', invoice.getReference())
def test_16_ManuallyAddedMovements(self, quiet=quiet):
"""
More information about the Erp5-report
mailing list