Skip to content

erp5
erp5
Commit 509f4c5e authored by Sebastien Robin's avatar Sebastien Robin
Browse files
Options

rewrote it partially 


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@3340 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 5d7dae0b
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 110 deletions
product/ERP5/Extensions/InventoryBrain.py
View file @ 509f4c5e
...@@ -16,6 +16,7 @@ from Products.ZSQLCatalog.zsqlbrain import ZSQLBrain ...@@ -16,6 +16,7 @@ from Products.ZSQLCatalog.zsqlbrain import ZSQLBrain
from DateTime import DateTime from DateTime import DateTime
from ZTUtils import make_query from ZTUtils import make_query
from Products.CMFCore.utils import getToolByName
from zLOG import LOG from zLOG import LOG
class InventoryBrain(ZSQLBrain): class InventoryBrain(ZSQLBrain):
...@@ -73,24 +74,6 @@ class InventoryBrain(ZSQLBrain): ...@@ -73,24 +74,6 @@ class InventoryBrain(ZSQLBrain):
reserved_inventory = 0.0 reserved_inventory = 0.0
return current + reserved_inventory return current + reserved_inventory
# ????
#def getAvailableInventory2(self):
# """
# Returns current inventory
# """
# at_date=DateTime()
# current = self.getCurrentInventory()
# result = self.Resource_zGetInventory( resource_uid = [self.resource_uid], ignore_variation=1,
# omit_simulation = 1, omit_input = 1,
# section_category = self.getPortalDefaultSectionCategory(),
# simulation_state = reserved_inventory_state_list2)
# reserved_inventory = None
# if len(result) > 0:
# reserved_inventory = result[0].inventory
# if reserved_inventory is None:
# reserved_inventory = 0.0
# return current + reserved_inventory
def getQuantityUnit(self, **kw): def getQuantityUnit(self, **kw):
try: try:
resource = self.portal_categories.unrestrictedTraverse(self.resource_relative_url) resource = self.portal_categories.unrestrictedTraverse(self.resource_relative_url)
...@@ -105,87 +88,38 @@ class InventoryListBrain(ZSQLBrain): ...@@ -105,87 +88,38 @@ class InventoryListBrain(ZSQLBrain):
""" """
# Stock management # Stock management
def getInventory(self, at_date = None, ignore_variation=0, simulation_state=None, **kw): def getInventory(self, **kw):
if type(simulation_state) is type('a'): """
simulation_state = [simulation_state] Returns the inventory
if getattr(self, 'group_by_section', 1): """
result = self.Resource_zGetInventory( resource_uid = [self.resource_uid], simulation_tool = getToolByName(self,'portal_simulation')
to_date=at_date, return simulation_tool.getInventory(node=self.node_relative_url,variation_text=self.variation_text,
section=self.section_relative_url, resource=self.resource_relative_url,**kw)
node=self.node_relative_url,
variation_text = self.variation_text,
simulation_state=simulation_state)
else:
result = self.Resource_zGetInventory( resource_uid = [self.resource_uid],
to_date=at_date,
section_category=self.section_category,
node=self.node_relative_url,
variation_text = self.variation_text,
simulation_state=simulation_state)
inventory = None
if len(result) > 0:
inventory = result[0].inventory
if inventory is None:
return 0.0
else:
return inventory
#getCurrentInventory = 10.0 #getCurrentInventory = 10.0
def getCurrentInventory(self): def getCurrentInventory(self,**kw):
""" """
Returns current inventory Returns current inventory
""" """
return self.getInventory(simulation_state=self.getPortalCurrentInventoryStateList(), ignore_variation=0) simulation_tool = getToolByName(self,'portal_simulation')
#return self.getInventory(at_date=DateTime(), ignore_variation=0) return simulation_tool.getCurrentInventory(node=self.node_relative_url,variation_text=self.variation_text,
resource=self.resource_relative_url,**kw)
def getFutureInventory(self): def getFutureInventory(self,**kw):
""" """
Returns current inventory Returns current inventory
""" """
return self.getInventory(ignore_variation=0, simulation_tool = getToolByName(self,'portal_simulation')
simulation_state=list(self.getPortalFutureInventoryStateList())+ \ return simulation_tool.getFutureInventory(node=self.node_relative_url,variation_text=self.variation_text,
list(self.getPortalReservedInventoryStateList())+ \ resource=self.resource_relative_url,**kw)
list(self.getPortalCurrentInventoryStateList()))
def getAvailableInventory(self): def getAvailableInventory(self,**kw):
""" """
Returns current inventory Returns current inventory
""" """
at_date=DateTime() simulation_tool = getToolByName(self,'portal_simulation')
current = self.getCurrentInventory() return simulation_tool.getAvailableInventory(node=self.node_relative_url,variation_text=self.variation_text,
result = self.Resource_zGetInventory( resource_uid = [self.resource_uid], resource=self.resource_relative_url,**kw)
omit_simulation = 1, omit_input = 1,
section=self.section_relative_url,
node=self.node_relative_url,
variation_text = self.variation_text,
simulation_state = self.getPortalReservedInventoryStateList())
reserved_inventory = None
if len(result) > 0:
reserved_inventory = result[0].inventory
if reserved_inventory is None:
reserved_inventory = 0.0
return current + reserved_inventory
# ????
#def getAvailableInventory2(self):
# """
# Returns current inventory
# """
# at_date=DateTime()
# current = self.getCurrentInventory()
# # XXX - This code is not OK if we define section_category / node_category
# result = self.Resource_zGetInventory( resource_uid = [self.resource_uid],
# omit_simulation = 1, omit_input = 1,
# section=self.section_relative_url,
# node=self.node_relative_url,
# variation_text = self.variation_text,
# simulation_state = reserved_inventory_state_list2)
# reserved_inventory = None
# if len(result) > 0:
# reserved_inventory = result[0].inventory
# if reserved_inventory is None:
# reserved_inventory = 0.0
# return current + reserved_inventory
def getQuantity(self, **kw): def getQuantity(self, **kw):
result = self.Delivery_zGetTotal( resource_uid = [self.resource_uid], result = self.Delivery_zGetTotal( resource_uid = [self.resource_uid],
...@@ -241,11 +175,6 @@ class InventoryListBrain(ZSQLBrain): ...@@ -241,11 +175,6 @@ class InventoryListBrain(ZSQLBrain):
return '%s/Resource_movementHistoryView?%s&reset=1' % (resource.absolute_url(), return '%s/Resource_movementHistoryView?%s&reset=1' % (resource.absolute_url(),
make_query(variation_text=self.variation_text, selection_name=selection_name, selection_index=selection_index,omit_simulation = 1, omit_input = 1, make_query(variation_text=self.variation_text, selection_name=selection_name, selection_index=selection_index,omit_simulation = 1, omit_input = 1,
simulation_state=list(self.getPortalReservedInventoryStateList()))) simulation_state=list(self.getPortalReservedInventoryStateList())))
#elif cname_id in ('getAvailableInventory2',):
# resource = self.portal_categories.unrestrictedTraverse(self.resource_relative_url)
# return '%s/Resource_movementHistoryView?%s&reset=1' % (resource.absolute_url(),
# make_query(variation_text=self.variation_text, selection_name=selection_name, selection_index=selection_index,omit_simulation = 1, omit_input = 1,
# simulation_state=list(reserved_inventory_state_list2)))
elif cname_id in ('getFutureInventory','inventory', ): elif cname_id in ('getFutureInventory','inventory', ):
resource = self.portal_categories.unrestrictedTraverse(self.resource_relative_url) resource = self.portal_categories.unrestrictedTraverse(self.resource_relative_url)
return '%s/Resource_movementHistoryView?%s&reset=1' % (resource.absolute_url(), return '%s/Resource_movementHistoryView?%s&reset=1' % (resource.absolute_url(),
...@@ -363,25 +292,6 @@ class DeliveryListBrain(InventoryListBrain): ...@@ -363,25 +292,6 @@ class DeliveryListBrain(InventoryListBrain):
reserved_inventory = 0.0 reserved_inventory = 0.0
return current + reserved_inventory return current + reserved_inventory
# ????
#def getAvailableInventory2(self):
# """
# Returns current inventory at current date
# """
# at_date=DateTime()
# current = self.getCurrentInventory()
# result = self.Resource_zGetInventory( resource_uid = [self.resource_uid],
# omit_simulation = 1, omit_input = 1,
# section_category = self.getPortalDefaultSectionCategory(),
# variation_text = self.variation_text,
# simulation_state = reserved_inventory_state_list2)
# reserved_inventory = None
# if len(result) > 0:
# reserved_inventory = result[0].inventory
# if reserved_inventory is None:
# reserved_inventory = 0.0
# return current + reserved_inventory
def getInventoryAtDate(self): def getInventoryAtDate(self):
""" """
Returns inventory at the date provided by the SQL method Returns inventory at the date provided by the SQL method
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7