[Erp5-report] r31379 kazuhiko - in /erp5/trunk/products/ERP5: Document/ PropertySheet/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Dec 17 17:17:51 2009
New Revision: 31379

URL: http://svn.erp5.org?rev=31379&view=rev
Log:
delivery_solver, start_date and stop_date should be in configuration property dict, not in direct properties.

Modified:
    erp5/trunk/products/ERP5/Document/QuantitySplitSolver.py
    erp5/trunk/products/ERP5/PropertySheet/TargetSolver.py

Modified: erp5/trunk/products/ERP5/Document/QuantitySplitSolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/QuantitySplitSolver.py?rev=31379&r1=31378&r2=31379&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/QuantitySplitSolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/QuantitySplitSolver.py [utf8] Thu Dec 17 17:17:51 2009
@@ -68,7 +68,9 @@
     for delivery_line in self.getDeliveryValueList(): 
       decision_quantity = delivery_line.getQuantity()
       simulation_movement_list = delivery_line.getDeliveryRelatedValueList()
-      delivery_solver = self.portal_solvers.newDeliverySolver(self.getDeliverySolver(), simulation_movement_list)
+      configuration_dict = self.getConfigurationPropertyDict()
+      delivery_solver = self.portal_solvers.newDeliverySolver(
+        configuration_dict['delivery_solver'], simulation_movement_list)
       # Update the quantity using delivery solver algorithm
       split_list = delivery_solver.setTotalQuantity(decision_quantity)
       # Create split movements
@@ -77,5 +79,5 @@
           batch_mode=True) # Copy at same level
         new_movement._setDelivery(None)
         new_movement._setQuantity(split_quantity)
-        new_movement._setStartDate(self.getStartDate())
-        new_movement._setStopDate(self.getStopDate())
+        new_movement._setStartDate(configuration_dict['start_date'])
+        new_movement._setStopDate(configuration_dict['stop_date'])

Modified: erp5/trunk/products/ERP5/PropertySheet/TargetSolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/TargetSolver.py?rev=31379&r1=31378&r2=31379&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/TargetSolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/PropertySheet/TargetSolver.py [utf8] Thu Dec 17 17:17:51 2009
@@ -30,24 +30,4 @@
 from Products.CMFCore.Expression import Expression
 
 class TargetSolver:
-  _properties = (
-        { 'id':         'delivery_solver',
-          'type':       'string',
-          'mode':       'w',
-          'label':      'Delivery Solver'
-         },
-        { 'id':         'start_date',
-          'description':'The date when a new movement starts',
-          'type':       'date',
-          'mode':       'w',
-          'label':      'Start Date'
-          },
-        { 'id':         'stop_date',
-          'description':'The date when a new movement stops',
-          'type':       'date',
-          'mode':       'w',
-          'label':      'Stop Date'
-          },
-  )
-
   _categories = ('delivery',)