[Erp5-report] r26966 - /erp5/trunk/products/ERP5/tests/

[nobody at svn.erp5.org]

Author: jerome
Date: Thu May 14 10:48:52 2009
New Revision: 26966

URL: http://svn.erp5.org?rev=26966&view=rev
Log:
some tests were using "transaction" as local variable name, and thus hiding the
transaction module 


Modified:
    erp5/trunk/products/ERP5/tests/testERP5CurrencyExchangeLine.py
    erp5/trunk/products/ERP5/tests/testImmobilisation.py

Modified: erp5/trunk/products/ERP5/tests/testERP5CurrencyExchangeLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testERP5CurrencyExchangeLine.py?rev=26966&r1=26965&r2=26966&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testERP5CurrencyExchangeLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testERP5CurrencyExchangeLine.py [utf8] Thu May 14 10:48:52 2009
@@ -163,7 +163,7 @@
     self.assertEquals(x_curr_ex_line.getValidationState(),
                            'validated')
     accounting_module = self.portal.accounting_module
-    transaction = self._makeOne(
+    invoice = self._makeOne(
                portal_type='Purchase Invoice Transaction',
                stop_date=DateTime('2008/09/08'),
             source_section_value=self.organisation_module.supplier,
@@ -172,8 +172,8 @@
                            destination_debit=500),
               dict(destination_value=self.account_module.receivable,
                            destination_credit=500)))
-    transaction.AccountingTransaction_convertDestinationPrice(form_id='view')
-    line_list = transaction.contentValues(
+    invoice.AccountingTransaction_convertDestinationPrice(form_id='view')
+    line_list = invoice.contentValues(
            portal_type=portal.getPortalAccountingMovementTypeList())
     for line in line_list:
 	self.assertEquals(line.getDestinationTotalAssetPrice(),
@@ -235,7 +235,7 @@
                            portal_type='Currency Exchange Line')
     euro_line.validate()
     accounting_module = self.portal.accounting_module
-    transaction = self._makeOne(
+    invoice = self._makeOne(
                portal_type='Purchase Invoice Transaction',
                stop_date=DateTime('2008/09/08'),
            source_section_value=self.organisation_module.supplier,
@@ -244,9 +244,9 @@
                            destination_debit=500),
               dict(destination_value=self.account_module.receivable,
                            destination_credit=500)))
-    transaction.AccountingTransaction_convertDestinationPrice(
+    invoice.AccountingTransaction_convertDestinationPrice(
                          form_id='view')
-    line_list = transaction.contentValues(
+    line_list = invoice.contentValues(
            portal_type=portal.getPortalAccountingMovementTypeList())
     for line in line_list:
         self.assertEquals(line.getDestinationTotalAssetPrice(),
@@ -290,7 +290,7 @@
     self.assertEquals(x_curr_ex_line.getValidationState(),
                          'validated')
     accounting_module = self.portal.accounting_module
-    transaction = self._makeOne(
+    invoice = self._makeOne(
                portal_type='Sale Invoice Transaction',
                start_date=DateTime('2008/09/08'),
         destination_section_value=self.organisation_module.supplier,
@@ -298,9 +298,9 @@
                            source_debit=500),
                    dict(source_value=self.account_module.receivable,
                            source_credit=500)))
-    transaction.AccountingTransaction_convertSourcePrice(
+    invoice.AccountingTransaction_convertSourcePrice(
                    form_id='view')
-    line_list = transaction.contentValues(
+    line_list = invoice.contentValues(
            portal_type=portal.getPortalAccountingMovementTypeList())
     for line in line_list:
 	self.assertEquals(line.getSourceTotalAssetPrice(),
@@ -329,7 +329,7 @@
                 price_currency=new_currency.getRelativeUrl())
     euro = self.portal.currency_module.euro
     accounting_module = self.portal.accounting_module
-    transaction = self._makeOne(
+    invoice = self._makeOne(
                portal_type='Purchase Invoice Transaction',
                stop_date=DateTime('2008/09/08'),
             source_section_value=self.organisation_module.supplier,
@@ -338,9 +338,9 @@
                            destination_debit=500),
               dict(destination_value=self.account_module.receivable,
                            destination_credit=500)))
-    transaction.AccountingTransaction_convertDestinationPrice(
+    invoice.AccountingTransaction_convertDestinationPrice(
                         form_id='view')
-    line_list = transaction.contentValues(
+    line_list = invoice.contentValues(
            portal_type=portal.getPortalAccountingMovementTypeList())
     for line in line_list:
 	self.assertEquals(line.getDestinationTotalAssetPrice(),None)
@@ -456,7 +456,7 @@
                           'validated')
     
     accounting_module = self.portal.accounting_module
-    transaction = self._makeOne(
+    invoice = self._makeOne(
                portal_type='Purchase Invoice Transaction',
                stop_date=DateTime('2008/09/08'),
              source_section_value=self.organisation_module.supplier,
@@ -466,9 +466,9 @@
               dict(destination_value=self.account_module.receivable,
                            destination_credit=500)))
     
-    transaction.AccountingTransaction_convertDestinationPrice(
+    invoice.AccountingTransaction_convertDestinationPrice(
                            form_id='view')
-    line_list = transaction.contentValues(
+    line_list = invoice.contentValues(
            portal_type=portal.getPortalAccountingMovementTypeList())
     for line in line_list:
         self.assertEquals(line.getDestinationTotalAssetPrice(),
@@ -527,7 +527,7 @@
     self.assertEquals(euro_line2.getValidationState(),
                                  'validated')
     accounting_module = self.portal.accounting_module
-    transaction = self._makeOne(
+    invoice = self._makeOne(
                portal_type='Purchase Invoice Transaction',
                stop_date=DateTime('2008/09/08'),
             source_section_value=self.organisation_module.supplier,
@@ -536,9 +536,9 @@
                            destination_debit=500),
               dict(destination_value=self.account_module.receivable,
                            destination_credit=500)))
-    transaction.AccountingTransaction_convertDestinationPrice(
+    invoice.AccountingTransaction_convertDestinationPrice(
                            form_id='view')
-    line_list = transaction.contentValues(
+    line_list = invoice.contentValues(
            portal_type=portal.getPortalAccountingMovementTypeList())
     for line in line_list:
         self.assertEquals(line.getDestinationTotalAssetPrice(),

Modified: erp5/trunk/products/ERP5/tests/testImmobilisation.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testImmobilisation.py?rev=26966&r1=26965&r2=26966&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testImmobilisation.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testImmobilisation.py [utf8] Thu May 14 10:48:52 2009
@@ -571,11 +571,11 @@
     self.getAccountingModule().manage_delObjects(id_list)
     
   def stepValidateAccounting(self, sequence=None, sequence_list=None, **kw):
-    for transaction in self.getAccountingModule().contentValues():
-      transaction.stop()
+    for accounting_transaction in self.getAccountingModule().contentValues():
+      accounting_transaction.stop()
       transaction.commit()
       self.tic()
-      transaction.deliver()
+      accounting_transaction.deliver()
       transaction.commit()
       self.tic()