From fc0f03be07b407668aede041a41ce03083979df7 Mon Sep 17 00:00:00 2001 From: Sebastien Robin <seb@nexedi.com> Date: Thu, 17 Aug 2006 15:29:57 +0000 Subject: [PATCH] commit patch of Thierry, production rules where only partially expanded git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9247 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5/Document/TransformedResource.py | 5 ++++- product/ERP5/tests/testProductionOrder.py | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/product/ERP5/Document/TransformedResource.py b/product/ERP5/Document/TransformedResource.py index ba039db6e9..aabed5497a 100644 --- a/product/ERP5/Document/TransformedResource.py +++ b/product/ERP5/Document/TransformedResource.py @@ -178,7 +178,10 @@ class TransformedResource(Predicate, XMLObject, XMLMatrix, Amount): # 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 diff --git a/product/ERP5/tests/testProductionOrder.py b/product/ERP5/tests/testProductionOrder.py index a6ea0354e0..0bb36bd998 100644 --- a/product/ERP5/tests/testProductionOrder.py +++ b/product/ERP5/tests/testProductionOrder.py @@ -341,7 +341,9 @@ class TestProductionOrderMixin(TestOrderMixin): 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 -- 2.30.9