[Erp5-report] r16011 - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: romain
Date: Mon Sep  3 10:26:13 2007
New Revision: 16011

URL: http://svn.erp5.org?rev=16011&view=rev
Log:
Do not expand simulation related to an Order when expanding.
This part is not managed with the order_simulation_interaction_workflow and
order_movement_simulation_interaction_workflow.

Modified:
    erp5/trunk/products/ERP5/Document/Order.py
    erp5/trunk/products/ERP5/Document/OrderCell.py
    erp5/trunk/products/ERP5/Document/OrderLine.py

Modified: erp5/trunk/products/ERP5/Document/Order.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Order.py?rev=16011&r1=16010&r2=16011&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Order.py (original)
+++ erp5/trunk/products/ERP5/Document/Order.py Mon Sep  3 10:26:13 2007
@@ -144,14 +144,6 @@
       LOG('Order.updateAppliedRule ',0,'This method this method should not be used anymore.')
       Delivery.updateAppliedRule(self, rule_id, force=force,**kw)
 
-    def recursiveReindexObject(self, activate_kw=None, *k, **kw):
-      """
-      Reindex children and simulation
-      """
-      Delivery.recursiveReindexObject(self, activate_kw=activate_kw, *k, **kw)
-      self.activate(activate_kw=activate_kw).\
-          expandAppliedRuleRelatedToOrder(activate_kw=activate_kw, **kw)
-
     def expandAppliedRuleRelatedToOrder(self, activate_kw=None,**kw):
       """
       Expand the applied rule related 

Modified: erp5/trunk/products/ERP5/Document/OrderCell.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OrderCell.py?rev=16011&r1=16010&r2=16011&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OrderCell.py (original)
+++ erp5/trunk/products/ERP5/Document/OrderCell.py Mon Sep  3 10:26:13 2007
@@ -74,11 +74,3 @@
       Reindex children and simulation
       """
       self.recursiveReindexObject(*k,**kw)
-
-    security.declarePublic('recursiveReindexObject')
-    def recursiveReindexObject(self, activate_kw={}, *k, **kw):
-      """
-      Reindex children and simulation
-      """
-      self.getExplanationValue().expandAppliedRuleRelatedToOrder(activate_kw=activate_kw, **kw)
-      DeliveryCell.recursiveReindexObject(self, activate_kw=activate_kw, *k, **kw)

Modified: erp5/trunk/products/ERP5/Document/OrderLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OrderLine.py?rev=16011&r1=16010&r2=16011&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OrderLine.py (original)
+++ erp5/trunk/products/ERP5/Document/OrderLine.py Mon Sep  3 10:26:13 2007
@@ -95,17 +95,6 @@
                                    portal_type = 'Simulation Movement'):
           # And apply
           getattr(my_simulation_movement, method_id)()
-    
-    security.declarePublic('recursiveReindexObject')    
-    def recursiveReindexObject(self, activate_kw={}, *k, **kw):
-      """
-        Reindex children and simulation
-      """
-      self.getExplanationValue().expandAppliedRuleRelatedToOrder(activate_kw=activate_kw, **kw)
-      DeliveryLine.recursiveReindexObject(self, activate_kw=activate_kw, *k, **kw)
-      #self.activate().applyToOrderLineRelatedMovement(method_id = 'expand')
-      # We do it at Order level through edit
-      # This logic should actually be put in worklow
 
     # Simulation Consistency Check
     def getSimulationQuantity(self):