Commit d19c991a authored by Jean-Paul Smets's avatar Jean-Paul Smets

getAvailableInventory2 added. Better presentation of URLs and explanation


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1231 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e9b049d0
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
# #
############################################################################## ##############################################################################
from Products.ERP5.ERP5Globals import default_section_category, current_inventory_state_list, reserved_inventory_state_list,future_inventory_state_list from Products.ERP5.ERP5Globals import default_section_category, current_inventory_state_list, reserved_inventory_state_list,reserved_inventory_state_list2,future_inventory_state_list
from Products.ZSQLCatalog.zsqlbrain import ZSQLBrain from Products.ZSQLCatalog.zsqlbrain import ZSQLBrain
from DateTime import DateTime from DateTime import DateTime
from ZTUtils import make_query from ZTUtils import make_query
...@@ -71,6 +71,23 @@ class InventoryBrain(ZSQLBrain): ...@@ -71,6 +71,23 @@ 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 = default_section_category,
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)
...@@ -143,6 +160,26 @@ class InventoryListBrain(ZSQLBrain): ...@@ -143,6 +160,26 @@ class InventoryListBrain(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()
# 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],
variation_text = self.variation_text) variation_text = self.variation_text)
...@@ -197,6 +234,11 @@ class InventoryListBrain(ZSQLBrain): ...@@ -197,6 +234,11 @@ 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(reserved_inventory_state_list))) simulation_state=list(reserved_inventory_state_list)))
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(),
...@@ -234,6 +276,13 @@ class InventoryListBrain(ZSQLBrain): ...@@ -234,6 +276,13 @@ class InventoryListBrain(ZSQLBrain):
if portal_type == "Simulation Movement": if portal_type == "Simulation Movement":
order = o.getExplanationValue() order = o.getExplanationValue()
if order is not None: if order is not None:
if order.getPortalType() == 'Sales Order' :
return "%s %s %s" % ('Commande vente', order.getId(), order.getDestinationDecisionOrganisationTitle())
elif order.getPortalType() == 'Purchase Order' :
return "%s %s %s" % ('Commande achat', order.getId(), order.getSourceDecisionTitle())
elif order.getPortalType() == 'Production Order' :
return "%s %s %s %ip" % ('OF', order.getId(), order.getDescription(), order.getTotalQuantity())
else :
return "%s %s" % ('Simulated Order', order.getId()) # Tried to use unicode but failed - ListBot must use unicode in % replacements return "%s %s" % ('Simulated Order', order.getId()) # Tried to use unicode but failed - ListBot must use unicode in % replacements
else: else:
LOG("Delivery Value",0,str(self.path)) LOG("Delivery Value",0,str(self.path))
...@@ -242,8 +291,22 @@ class InventoryListBrain(ZSQLBrain): ...@@ -242,8 +291,22 @@ class InventoryListBrain(ZSQLBrain):
if delivery is not None: if delivery is not None:
causality = delivery.getCausalityValue() causality = delivery.getCausalityValue()
if causality is None: if causality is None:
if delivery.getPortalType() == 'Sales Packing List' :
return "%s %s %s" % ('Livraison vente', delivery.getId(), delivery.getDestinationDecisionOrganisationTitle())
elif delivery.getPortalType() == 'Purchase Packing List' :
return "%s %s %s" % ('Livraison achat', delivery.getId(), delivery.getSourceDecisionTitle())
else :
return "%s %s" % (delivery.getPortalType(), delivery.getId()) return "%s %s" % (delivery.getPortalType(), delivery.getId())
else: else:
if delivery.getPortalType() == 'Sales Packing List' :
return "%s %s %s (cde %s)" % ('Livraison vente', delivery.getId(), delivery.getDestinationDecisionOrganisationTitle(), causality.getId())
elif delivery.getPortalType() == 'Purchase Packing List' :
return "%s %s %s (cde %s)" % ('Livraison achat', delivery.getId(), delivery.getSourceDecisionTitle(), causality.getId())
elif delivery.getPortalType() == 'Production Packing List' :
return "%s %s (of %s %s %ip)" % ('Livraison fabrication', delivery.getId(), causality.getId(), causality.getDescription(), causality.getTotalQuantity())
elif delivery.getPortalType() == 'Production Report' :
return "%s %s (of %s %s %ip)" % ('Rapport fabrication', delivery.getId(), causality.getId(), causality.getDescription(), causality.getTotalQuantity())
else :
return "%s %s (%s %s)" % (delivery.getPortalType(), delivery.getId(), return "%s %s (%s %s)" % (delivery.getPortalType(), delivery.getId(),
causality.getPortalType(), causality.getId()) causality.getPortalType(), causality.getId())
return "Unknown" return "Unknown"
...@@ -293,6 +356,24 @@ class DeliveryListBrain(InventoryListBrain): ...@@ -293,6 +356,24 @@ 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 = default_section_category,
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