Commit da6240bd authored by Alexandre Boeglin's avatar Alexandre Boeglin

Removed references to target_quantity, target_start_date and target_stop_date...

Removed references to target_quantity, target_start_date and target_stop_date from methods used to index deliveries in stock and movement tables, as Jean-Paul stated that they are not useful any longer.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@2730 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent ed5a9a85
...@@ -297,38 +297,20 @@ Une ligne tarifaire.""" ...@@ -297,38 +297,20 @@ Une ligne tarifaire."""
security.declareProtected(Permissions.AccessContentsInformation, 'getInventoriatedQuantity') security.declareProtected(Permissions.AccessContentsInformation, 'getInventoriatedQuantity')
def getInventoriatedQuantity(self): def getInventoriatedQuantity(self):
""" """
Take into account efficiency in converted target quantity
""" """
if self.getSimulationState() in self.getPortalTargetInventoryStateList(): return Movement.getInventoriatedQuantity(self)
# When an order is delivered, the target quantity should be considered
# rather than the quantity
return Movement.getNetConvertedTargetQuantity(self)
else:
return Movement.getInventoriatedQuantity(self)
security.declareProtected(Permissions.AccessContentsInformation, 'getStartDate') security.declareProtected(Permissions.AccessContentsInformation, 'getStartDate')
def getStartDate(self): def getStartDate(self):
""" """
Take into account efficiency in converted target quantity
""" """
if self.getSimulationState() in self.getPortalCurrentInventoryStateList(): return self._baseGetStartDate()
# When an order is delivered, the target quantity should be considered
# rather than the quantity
return self._baseGetTargetStartDate()
else:
return self._baseGetStartDate()
security.declareProtected(Permissions.AccessContentsInformation, 'getStopDate') security.declareProtected(Permissions.AccessContentsInformation, 'getStopDate')
def getStopDate(self): def getStopDate(self):
""" """
Take into account efficiency in converted target quantity
""" """
if self.getSimulationState() in self.getPortalCurrentInventoryStateList(): return self._baseGetStopDate()
# When an order is delivered, the target quantity should be considered
# rather than the quantity
return self._baseGetTargetStopDate()
else:
return self._baseGetStopDate()
security.declareProtected(Permissions.AccessContentsInformation, 'getStopDate') security.declareProtected(Permissions.AccessContentsInformation, 'getStopDate')
def getRootDeliveryValue(self): def getRootDeliveryValue(self):
......
...@@ -362,39 +362,20 @@ Une ligne tarifaire.""" ...@@ -362,39 +362,20 @@ Une ligne tarifaire."""
security.declareProtected(Permissions.AccessContentsInformation, 'getInventoriatedQuantity') security.declareProtected(Permissions.AccessContentsInformation, 'getInventoriatedQuantity')
def getInventoriatedQuantity(self): def getInventoriatedQuantity(self):
""" """
Take into account efficiency in converted target quantity
Maybe we should only use target if isDivergent
""" """
if self.getSimulationState() in self.getPortalTargetInventoryStateList(): return Movement.getInventoriatedQuantity(self)
# When an order is delivered, the target quantity should be considered
# rather than the quantity
return Movement.getNetConvertedTargetQuantity(self)
else:
return Movement.getInventoriatedQuantity(self)
security.declareProtected(Permissions.AccessContentsInformation, 'getInventoriatedStartDate') security.declareProtected(Permissions.AccessContentsInformation, 'getInventoriatedStartDate')
def getInventoriatedStartDate(self): def getInventoriatedStartDate(self):
""" """
Take into account efficiency in converted target quantity
""" """
if self.getSimulationState() in self.getPortalCurrentInventoryStateList(): return Movement.getStartDate(self)
# When an order is delivered, the target quantity should be considered
# rather than the quantity
return Movement.getTargetStartDate(self)
else:
return Movement.getStartDate(self)
security.declareProtected(Permissions.AccessContentsInformation, 'getInventoriatedStopDate') security.declareProtected(Permissions.AccessContentsInformation, 'getInventoriatedStopDate')
def getInventoriatedStopDate(self): def getInventoriatedStopDate(self):
""" """
Take into account efficiency in converted target quantity
""" """
if self.getSimulationState() in self.getPortalCurrentInventoryStateList(): return Movement.getStopDate(self)
# When an order is delivered, the target quantity should be considered
# rather than the quantity
return Movement.getTargetStopDate(self)
else:
return Movement.getStopDate(self)
def _setItemIdList(self, value): def _setItemIdList(self, value):
""" """
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment