erp5_core: SQUASH

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.InventoryCell.py

@@ -26,15 +26,14 @@
 #
 ##############################################################################
 
-from Acquisition import aq_base
 from AccessControl import ClassSecurityInfo
+from Acquisition import aq_base
 
 from Products.ERP5Type import Permissions, PropertySheet
 
-from erp5.component.document.MappedValue import MappedValue
 from erp5.component.document.Amount import Amount
 
-class InventoryCell(MappedValue, Amount):
+class InventoryCell(Amount):
   """
   An InventoryCell allows to define specific inventory
   for each variation of a resource in an inventory line.
@@ -49,17 +48,42 @@ class InventoryCell(MappedValue, Amount):
 
   # Declarative properties
   property_sheets = ( PropertySheet.Base
+                    , PropertySheet.XMLObject
                     , PropertySheet.CategoryCore
                     , PropertySheet.Amount
                     , PropertySheet.InventoryMovement
                     , PropertySheet.Task
-                    , PropertySheet.Movement
                     , PropertySheet.Price
-                    , PropertySheet.Predicate
-                    , PropertySheet.MappedValue
                     , PropertySheet.ItemAggregation
                     )
 
+  security.declareProtected(Permissions.AccessContentsInformation,
+                            'hasCellContent')
+  def hasCellContent(self, base_id="movement"):
+    """
+    A cell cannot contain other Cells.
+    """
+    return False
+
+  security.declareProtected(Permissions.AccessContentsInformation,
+                            'getQuantity')
+  def getQuantity(self):
+    """
+    Computes a quantity which allows to reach inventory
+    """
+    if not self.hasCellContent():
+      # First check if quantity already exists
+      quantity = self._baseGetQuantity()
+      if quantity not in (0.0, 0, None):
+        return quantity
+      # Make sure inventory is defined somewhere (here or parent)
+      inventory = getattr(aq_base(self), 'inventory', None)
+      if inventory is not None:
+        return inventory
+      return quantity
+    else:
+      return None
+
   security.declareProtected(Permissions.AccessContentsInformation, 'getTotalInventory')
   def getTotalInventory(self):
     """

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.InventoryCell.xml

@@ -43,9 +43,7 @@
         <item>
             <key> <string>text_content_warning_message</string> </key>
             <value>
-              <tuple>
-                <string>W: 29,  0: Unused aq_base imported from Acquisition (unused-import)</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.InventoryLine.py

@@ -27,9 +27,11 @@
 ##############################################################################
 
 from AccessControl import ClassSecurityInfo
+from Acquisition import aq_base
 
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.XMLMatrix import XMLMatrix
+
 from erp5.component.document.Movement import Movement
 from erp5.component.document.Amount import Amount
 
@@ -50,7 +52,9 @@ class InventoryLine(XMLMatrix, Amount):
                     , PropertySheet.XMLObject
                     , PropertySheet.CategoryCore
                     , PropertySheet.Amount
+                    , PropertySheet.InventoryMovement
                     , PropertySheet.Task
+                    , PropertySheet.Price
                     , PropertySheet.Arrow
                     , PropertySheet.VariationRange
                     , PropertySheet.ItemAggregation
@@ -65,6 +69,25 @@ class InventoryLine(XMLMatrix, Amount):
     cell_range = XMLMatrix.getCellRange(self, base_id=base_id)
     return (cell_range is not None and len(cell_range) > 0)
 
+  security.declareProtected(Permissions.AccessContentsInformation,
+                            'getQuantity')
+  def getQuantity(self):
+    """
+    Computes a quantity which allows to reach inventory
+    """
+    if not self.hasCellContent():
+      # First check if quantity already exists
+      quantity = self._baseGetQuantity()
+      if quantity not in (0.0, 0, None):
+        return quantity
+      # Make sure inventory is defined somewhere (here or parent)
+      inventory = getattr(aq_base(self), 'inventory', None)
+      if inventory is not None:
+        return inventory
+      return quantity
+    else:
+      return None
+
   security.declareProtected(Permissions.AccessContentsInformation, 'getTotalInventory')
   def getTotalInventory(self):
     """