[Erp5-report] r9247 - in /erp5/trunk/products/ERP5: Document/ tests/

[nobody at svn.erp5.org]

Author: seb
Date: Thu Aug 17 17:29:57 2006
New Revision: 9247

URL: http://svn.erp5.org?rev=9247&view=rev
Log:
commit patch of Thierry, production rules where only partially expanded

Modified:
    erp5/trunk/products/ERP5/Document/TransformedResource.py
    erp5/trunk/products/ERP5/tests/testProductionOrder.py

Modified: erp5/trunk/products/ERP5/Document/TransformedResource.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TransformedResource.py?rev=9247&r1=9246&r2=9247&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TransformedResource.py (original)
+++ erp5/trunk/products/ERP5/Document/TransformedResource.py Thu Aug 17 17:29:57 2006
@@ -178,7 +178,10 @@
         # must be true
         # Create temporary object to store amount
         from Products.ERP5Type.Document import newTempAmount
-        tmp_amount = newTempAmount(self.getPortalObject(), self.getId())
+        # XXX changed by TB getParentID()+getId() instead of getId()
+        # This might not be enough if we have different transformation
+        # with the same id (for example in several modules)
+        tmp_amount = newTempAmount(self.getPortalObject(), self.getParentId()+'_'+self.getId())
         # Create error string
         error_string = ''
         # Add resource relation

Modified: erp5/trunk/products/ERP5/tests/testProductionOrder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testProductionOrder.py?rev=9247&r1=9246&r2=9247&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testProductionOrder.py (original)
+++ erp5/trunk/products/ERP5/tests/testProductionOrder.py Thu Aug 17 17:29:57 2006
@@ -341,7 +341,9 @@
     simulation_movement_list = applied_rule.objectValues()
     self.assertEquals(2, len(simulation_movement_list))
     # Test consumed movement
-    consumed_movement = applied_rule.cr_1
+    transformation = sequence.get('transformation')
+    consumed_movement_id = 'cr_%s_1' % transformation.getId()
+    consumed_movement = applied_rule[consumed_movement_id]
     operation_resource = consumed_movement.portal_categories.resolveCategory(
                                               'operation/operation1')
     # FIXME