diff --git a/product/ERP5/Document/InventoryCell.py b/product/ERP5/Document/InventoryCell.py index 7e199f21dd9688ceb0d01a5db8014a60f674d1ca..ed715c55bc77c2b439ae073597095db652ec4560 100755 --- a/product/ERP5/Document/InventoryCell.py +++ b/product/ERP5/Document/InventoryCell.py @@ -104,22 +104,6 @@ class InventoryCell(DeliveryCell): # 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 - # Find total of movements in the past - XXX - resource_value = self.getResourceValue() - if resource_value is not None: - # Inventories can only be done in "real" locations / sectinos, not categories thereof - # -> therefore we use node and section - current_inventory = resource_value.getInventory( \ - to_date = self.getStartDate() - , variation_text = self.getVariationText() - , node = self.getDestination() - , section_category = self.getDestinationSection() - , simulation_state = self.getPortalCurrentInventoryStateList() - ) - inventory = self.getInventory() - if current_inventory in (None, ''): - current_inventory = 0.0 - return self.getInventory() - current_inventory return self.getInventory() else: return None diff --git a/product/ERP5/Document/InventoryLine.py b/product/ERP5/Document/InventoryLine.py index 9800c084a49bd5c3a7ee413ff98e2f376bf4cee8..f56b1129279b8e3379c450e34bede2f18eba7f6b 100755 --- a/product/ERP5/Document/InventoryLine.py +++ b/product/ERP5/Document/InventoryLine.py @@ -113,22 +113,6 @@ class InventoryLine(DeliveryLine): # 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 - # Find total of movements in the past - XXX - resource_value = self.getResourceValue() - if resource_value is not None: - # Inventories can only be done in "real" locations / sectinos, not categories thereof - # -> therefore we use node and section - current_inventory = resource_value.getInventory( \ - to_date = self.getStartDate() - , variation_text = self.getVariationText() - , node = self.getDestination() - , section = self.getDestinationSection() #section_category - , simulation_state = self.getPortalCurrentInventoryStateList() - ) - inventory = self.getInventory() - if current_inventory in (None, ''): - current_inventory = 0.0 - return self.getInventory() - current_inventory return self.getInventory() else: return None