[Erp5-report] r11608 - /erp5/trunk/products/ERP5/Document/InventoryLine.py

[nobody at svn.erp5.org]

Author: seb
Date: Tue Dec  5 11:50:19 2006
New Revision: 11608

URL: http://svn.erp5.org?rev=11608&view=rev
Log:
make sure getQuantity is working even if the value is 0

Modified:
    erp5/trunk/products/ERP5/Document/InventoryLine.py

Modified: erp5/trunk/products/ERP5/Document/InventoryLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/InventoryLine.py?rev=11608&r1=11607&r2=11608&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/InventoryLine.py (original)
+++ erp5/trunk/products/ERP5/Document/InventoryLine.py Tue Dec  5 11:50:19 2006
@@ -108,12 +108,14 @@
       if not self.hasCellContent():
         # First check if quantity already exists
         quantity = self._baseGetQuantity()
-        if quantity not in (0.0, 0, None):
+        if quantity not in (0.0,0,None):
           return quantity
         # Make sure inventory is defined somewhere (here or parent)
-        if getattr(aq_base(self), 'inventory', None) is None:
-          return 0.0 # No inventory defined, so no quantity
-        return self.getInventory()
+        _marker = []
+        inventory = getattr(aq_base(self), 'inventory', _marker)
+        if inventory is not _marker:
+          return inventory
+        return quantity
       else:
         return None