[Erp5-report] r37007 luke - in /erp5/trunk/products/ERP5: Document/ Interactor/

[nobody at svn.erp5.org]

Author: luke
Date: Fri Jul  9 14:12:59 2010
New Revision: 37007

URL: http://svn.erp5.org?rev=37007&view=rev
Log:
 - revert 36994 for now as it generates a lot of issues and requires additional coding to make it work

Modified:
    erp5/trunk/products/ERP5/Document/Container.py
    erp5/trunk/products/ERP5/Document/Delivery.py
    erp5/trunk/products/ERP5/Document/DeliveryLine.py
    erp5/trunk/products/ERP5/Interactor/RecursiveReindexInteractor.py

Modified: erp5/trunk/products/ERP5/Document/Container.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Container.py?rev=37007&r1=37006&r2=37007&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Container.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Container.py [utf8] Fri Jul  9 14:12:59 2010
@@ -74,6 +74,14 @@ class Container(Movement, XMLObject):
                       , PropertySheet.SortIndex
                       )
 
+    def reindexObject(self, *args, **kw):
+      """Reindex container and children
+
+      Children must be reindexed because PackingList.isPacked use the catalog
+      to find them.
+      """
+      self.recursiveReindexObject(*args, **kw)
+
     security.declareProtected(Permissions.AccessContentsInformation,
                               'getQuantity')
     def getQuantity(self, default=1.0):

Modified: erp5/trunk/products/ERP5/Document/Delivery.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Delivery.py?rev=37007&r1=37006&r2=37007&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Delivery.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Delivery.py [utf8] Fri Jul  9 14:12:59 2010
@@ -467,6 +467,17 @@ class Delivery(XMLObject, Immobilisation
 
 
     #######################################################
+    # Defer indexing process
+    def reindexObject(self, *k, **kw):
+      """
+        Reindex children and simulation
+      """
+      self.recursiveReindexObject(*k, **kw)
+      # NEW: we never rexpand simulation - This is a task for DSolver / TSolver
+      # Make sure expanded simulation is still OK (expand and reindex)
+      # self.activate().applyToDeliveryRelatedMovement(method_id = 'expand')
+
+    #######################################################
     # Stock Management
     def _getMovementResourceList(self):
       resource_dict = {}

Modified: erp5/trunk/products/ERP5/Document/DeliveryLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/DeliveryLine.py?rev=37007&r1=37006&r2=37007&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/DeliveryLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/DeliveryLine.py [utf8] Fri Jul  9 14:12:59 2010
@@ -240,6 +240,10 @@ class DeliveryLine(Movement, XMLObject, 
           # And apply
           getattr(my_simulation_movement.getObject(), method_id)()
 
+    def reindexObject(self, *k, **kw):
+      """Reindex children"""
+      self.recursiveReindexObject(*k, **kw)
+
     security.declareProtected(Permissions.AccessContentsInformation, 'getInventoriatedQuantity')
     def getInventoriatedQuantity(self):
       """

Modified: erp5/trunk/products/ERP5/Interactor/RecursiveReindexInteractor.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Interactor/RecursiveReindexInteractor.py?rev=37007&r1=37006&r2=37007&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Interactor/RecursiveReindexInteractor.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Interactor/RecursiveReindexInteractor.py [utf8] Fri Jul  9 14:12:59 2010
@@ -38,15 +38,6 @@ class RecursiveReindexInteractor(Interac
     from Products.ERP5.Document.TradeCondition import TradeCondition
     self.on(TradeCondition.reindexObject).doAfter(self.recursiveReindexObject)
 
-    from Products.ERP5.Document.Delivery import Delivery
-    self.on(Delivery.reindexObject).doAfter(self.recursiveReindexObject)
-
-    from Products.ERP5.Document.Container import Container
-    self.on(Container.reindexObject).doAfter(self.recursiveReindexObject)
-
-    from Products.ERP5.Document.DeliveryLine import DeliveryLine
-    self.on(DeliveryLine.reindexObject).doAfter(self.recursiveReindexObject)
-
   def recursiveReindexObject(self, method_call_object, *args, **kw):
     """
       Reindex content inside