diff --git a/product/ERP5/Document/InventoryCell.py b/product/ERP5/Document/InventoryCell.py index 2d0b9cb37e9aaed9c1cf171ff3eaab12e259f4bb..19160a59d1e762e8389472a93d8687d206871302 100755 --- a/product/ERP5/Document/InventoryCell.py +++ b/product/ERP5/Document/InventoryCell.py @@ -71,11 +71,8 @@ class InventoryCell(DeliveryCell): DeliveryCell._edit(self, REQUEST=REQUEST, force_update = force_update, **kw) # Calculate inventory item_list = self.getAggregateValueList() - if len(item_list) > 0: - inventory = 0 - for item in item_list: - if item.getQuantity() not in (None, ''): - inventory += item.getQuantity() + inventory = len(item_list) + if inventory != 0: self.setInventory(inventory) diff --git a/product/ERP5/Document/InventoryLine.py b/product/ERP5/Document/InventoryLine.py index 61223b820426bb0d39e74dece7cefb5988a7add2..f0f2972a0a90948f0cc94185f051ad53fbe1dd82 100755 --- a/product/ERP5/Document/InventoryLine.py +++ b/product/ERP5/Document/InventoryLine.py @@ -71,13 +71,11 @@ class InventoryLine(DeliveryLine): DeliveryLine._edit(self, REQUEST=REQUEST, force_update = force_update, **kw) # Calculate inventory item_list = self.getAggregateValueList() - if len(item_list) > 0: - inventory = 0 - for item in item_list: - if item.getQuantity() not in (None, ''): - inventory += item.getQuantity() + if item_list is not None: + inventory = len(item_list) + if inventory != 0: self.setInventory(inventory) - + security.declareProtected(Permissions.AccessContentsInformation, 'getTotalInventory') def getTotalInventory(self): @@ -128,9 +126,7 @@ class InventoryLine(DeliveryLine): inventory = self.getInventory() if current_inventory in (None, ''): current_inventory = 0.0 - LOG('return 1', 0, '%s - %s' % (repr(self.getInventory()), repr(current_inventory))) return self.getInventory() - current_inventory - LOG('return 2', 0, repr(self.getInventory())) return self.getInventory() else: return None