[Erp5-report] r33958 kazuhiko - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Mar 22 17:07:15 2010
New Revision: 33958

URL: http://svn.erp5.org?rev=33958&view=rev
Log:
now tested property list should be taken from Target Solver document or its portal type.

Modified:
    erp5/trunk/products/ERP5/Document/AcceptSolver.py
    erp5/trunk/products/ERP5/Document/AdoptSolver.py
    erp5/trunk/products/ERP5/Document/UnifySolver.py

Modified: erp5/trunk/products/ERP5/Document/AcceptSolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/AcceptSolver.py?rev=33958&r1=33957&r2=33958&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/AcceptSolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/AcceptSolver.py [utf8] Mon Mar 22 17:07:15 2010
@@ -63,8 +63,10 @@
     Adopt new property to simulation movements, with keeping the
     original one recorded.
     """
-    solved_property_list = self.getCausalityValue().getCausalityValue(). \
-                           getTestedPropertyList()
+    configuration_dict = self.getConfigurationPropertyDict()
+    portal_type = self.getPortalObject().portal_types[self.getPortalType()]
+    solved_property_list = configuration_dict.get('tested_property_list',
+                                                  portal_type.getTestedPropertyList())
     for movement in self.getDeliveryValueList():
       simulation_movement_list = movement.getDeliveryRelatedValueList()
       # if movement here is a delivery, we need to find simulation

Modified: erp5/trunk/products/ERP5/Document/AdoptSolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/AdoptSolver.py?rev=33958&r1=33957&r2=33958&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/AdoptSolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/AdoptSolver.py [utf8] Mon Mar 22 17:07:15 2010
@@ -64,8 +64,10 @@
     """
     Adopt new property to movements or deliveries.
     """
-    solved_property_list = self.getCausalityValue().getCausalityValue(). \
-                           getTestedPropertyList()
+    configuration_dict = self.getConfigurationPropertyDict()
+    portal_type = self.getPortalObject().portal_types[self.getPortalType()]
+    solved_property_list = configuration_dict.get('tested_property_list',
+                                                  portal_type.getTestedPropertyList())
     for movement in self.getDeliveryValueList():
       for solved_property in solved_property_list:
         # XXX hardcoded

Modified: erp5/trunk/products/ERP5/Document/UnifySolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/UnifySolver.py?rev=33958&r1=33957&r2=33958&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/UnifySolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/UnifySolver.py [utf8] Mon Mar 22 17:07:15 2010
@@ -61,9 +61,12 @@
     Adopt new property to simulation movements, with keeping the
     original one recorded.
     """
+    configuration_dict = self.getConfigurationPropertyDict()
+    portal_type = self.getPortalObject().portal_types[self.getPortalType()]
+    solved_property_list = configuration_dict.get('tested_property_list',
+                                                  portal_type.getTestedPropertyList())
     # XXX it does not support multiple tested properties.
-    solved_property = self.getCausalityValue().getCausalityValue(). \
-                      getTestedProperty()
+    solved_property = solved_property_list[0]
     for movement in self.getDeliveryValueList():
       configuration_dict = self.getConfigurationPropertyDict()
       new_value = configuration_dict.get('value')