[Erp5-report] r27689 - in /erp5/trunk/products/ERP5/tests: testInventory.py testOrder.py

[nobody at svn.erp5.org]

Author: seb
Date: Fri Jun 19 17:00:56 2009
New Revision: 27689

URL: http://svn.erp5.org?rev=27689&view=rev
Log:
- erp5_accounting and erp5_invoicing bt are useless for testInventory
- set manually the quantity on lines, it is not calculated automatically
  any more by default with the list of items.
- make sure to not create again the currency when it is already there
- do not set the inventory property on inventory line, this is useless
  and deprecated

Modified:
    erp5/trunk/products/ERP5/tests/testInventory.py
    erp5/trunk/products/ERP5/tests/testOrder.py

Modified: erp5/trunk/products/ERP5/tests/testInventory.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testInventory.py?rev=27689&r1=27688&r2=27689&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testInventory.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testInventory.py [utf8] Fri Jun 19 17:00:56 2009
@@ -74,8 +74,7 @@
   def getBusinessTemplateList(self):
     """Business Templates required for this test.
     """
-    return ('erp5_base', 'erp5_pdm', 'erp5_trade', 'erp5_apparel',
-            'erp5_accounting', 'erp5_invoicing')
+    return ('erp5_base', 'erp5_pdm', 'erp5_trade', 'erp5_apparel')
 
   def afterSetUp(self, quiet=1, run=run_all_test):
     self.login()
@@ -157,8 +156,10 @@
     aggregate_value_list = [item_list[0], item_list[2]]
     inventory_line = inventory.newContent(portal_type = self.inventory_line_portal_type)
     inventory_line.edit(resource_value = resource,
-                        inventory = 12., # Arbitrary inventory ; it should be never accessed while aggregating items
                         aggregate_value_list = aggregate_value_list)
+    # Now, quantity is not defined any more automatically. 
+    inventory_line.edit(quantity=sum([x.getQuantity() for x in \
+        aggregate_value_list]))
     inventory.deliver()
     inventory_list.append(inventory)
     sequence.edit(inventory_list = inventory_list)
@@ -1796,8 +1797,10 @@
     inventory = sequence.get('inventory_list')[0]
     inventory_line = inventory['1']
     item_list = sequence.get('item_list')
+    aggregate_value_list = [item_list[0],item_list[1], item_list[4]]
     inventory_line.edit(
-        aggregate_value_list = [item_list[0],item_list[1], item_list[4]])
+        aggregate_value_list=aggregate_value_list,
+        quantity=sum([x.getQuantity() for x in aggregate_value_list]))
                   
                 
   def test_01_getInventory(self, quiet=0, run=run_all_test):

Modified: erp5/trunk/products/ERP5/tests/testOrder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testOrder.py?rev=27689&r1=27688&r2=27689&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testOrder.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testOrder.py [utf8] Fri Jun 19 17:00:56 2009
@@ -77,8 +77,9 @@
     self.validateRules()
 
   def createCurrency(self):
-    portal = self.getPortal()
-    portal.currency_module.newContent(id='euro', reference='EUR', title='EURO')
+    currency_module = self.getPortal().currency_module
+    if currency_module._getOb('euro', None) is None:
+      currency_module.newContent(id='euro', reference='EUR', title='EURO')
 
   def createCategories(self):
     """