WIP: Remove InventoryInteractor.

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.InventoryCell.py

@@ -92,4 +92,13 @@ class InventoryCell(DeliveryCell):
     provides a default inventory value - None since
     no inventory was defined.
     """
-    return self.getInventory() # XXX quantity unit is missing
+    return self.getInventory() # XXX quantity unit is missing
\ No newline at end of file
+
+  def reindexObject(self, *args, **kw):
+    """
+    Reindex Inventory too
+    """
+    DeliveryCell.reindexObject(self, *args, **kw)
+    # No need to reindex recursively as Delivery does, so call
+    # _reindexObject() directly
+    self.getRootDeliveryValue()._reindexObject(*args, **kw)

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.InventoryLine.py

@@ -113,6 +113,15 @@ class InventoryLine(DeliveryLine):
     """
     return Movement.getInventoriatedQuantity(self)
 
+  def reindexObject(self, *args, **kw):
+    """
+    Reindex Inventory too
+    """
+    DeliveryLine.reindexObject(self, *args, **kw)
+    # No need to reindex recursively as Delivery does, so call
+    # _reindexObject() directly
+    self.getRootDeliveryValue()._reindexObject(*args, **kw)
+
   # XXX: Dirty but required for erp5_banking_core
   getBaobabSourceUid = lambda x: x.getSourceUid()
   getBaobabSourceUid__roles__ = PermissionRole(Permissions.View)
@@ -142,4 +151,4 @@ class InventoryLine(DeliveryLine):
   getBaobabSourceProjectUid__roles__ = PermissionRole(Permissions.View)
 
   getBaobabDestinationProjectUid = lambda x: x.getDestinationProjectUid()
-  getBaobabDestinationProjectUid__roles__ = PermissionRole(Permissions.View)
+  getBaobabDestinationProjectUid__roles__ = PermissionRole(Permissions.View)
\ No newline at end of file

product/ERP5/Interactor/InventoryInteractor.py

-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-from Products.ERP5Type.Interactor.Interactor import Interactor
-
-class InventoryInteractor(Interactor):
-  """
-  This interactor invokes reindex on Inventory document when its
-  subdocuments are modified.
-  """
-  def install(self):
-    from erp5.component.document.InventoryLine import InventoryLine
-    self.on(InventoryLine.reindexObject).doAfter(self.reindexInventory)
-    from erp5.component.document.InventoryCell import InventoryCell
-    self.on(InventoryCell.reindexObject).doAfter(self.reindexInventory)
-
-  def reindexInventory(self, method_call_object, *args, **kw):
-    """
-      Reindex inventory
-    """
-    inventory = method_call_object.instance.getRootDeliveryValue()
-    # No need to reindex recursively, so we call _reindexObject() not
-    # reindexObject() that is defined in Delivery.py as recursiveReindexObject().
-    inventory._reindexObject(**method_call_object.kw)