Commit 26c2d99a authored by Jean-Paul Smets's avatar Jean-Paul Smets

addPermission changed to addPortalContent

fixed Solanes typo
added force_update
better quantity calculation taking into account simulation_states


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@411 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 0c100680
############################################################################## ##############################################################################
# #
# Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved. # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
# Jean-Paul Smets-Solane <jp@nexedi.com> # Jean-Paul Smets-Solanes <jp@nexedi.com>
# #
# WARNING: This program as such is intended to be used by professional # WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsability of assessing all potential # programmers who take the whole responsability of assessing all potential
...@@ -30,6 +30,8 @@ from Globals import InitializeClass, PersistentMapping ...@@ -30,6 +30,8 @@ from Globals import InitializeClass, PersistentMapping
from AccessControl import ClassSecurityInfo from AccessControl import ClassSecurityInfo
from Acquisition import aq_base, aq_inner, aq_parent, aq_self from Acquisition import aq_base, aq_inner, aq_parent, aq_self
from Products.ERP5.ERP5Globals import current_inventory_state_list
from Products.CMFCore.WorkflowCore import WorkflowAction from Products.CMFCore.WorkflowCore import WorkflowAction
from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
from Products.ERP5Type.XMLMatrix import XMLMatrix from Products.ERP5Type.XMLMatrix import XMLMatrix
...@@ -50,7 +52,7 @@ class InventoryLine(DeliveryLine): ...@@ -50,7 +52,7 @@ class InventoryLine(DeliveryLine):
meta_type = 'ERP5 Inventory Line' meta_type = 'ERP5 Inventory Line'
portal_type = 'Inventory Line' portal_type = 'Inventory Line'
add_permission = Permissions.AddERP5Content add_permission = Permissions.AddPortalContent
isPortalContent = 1 isPortalContent = 1
isRADContent = 1 isRADContent = 1
...@@ -161,7 +163,8 @@ Une ligne tarifaire.""" ...@@ -161,7 +163,8 @@ Une ligne tarifaire."""
at_date = self.getStartDate(), at_date = self.getStartDate(),
variation_text = self.getVariationText(), variation_text = self.getVariationText(),
node = self.getDestination(), node = self.getDestination(),
section = self.getDestinationSection()) section = self.getDestinationSection(),
simulation_state = current_inventory_state_list)
inventory = self.getInventory() inventory = self.getInventory()
if inventory in (None, ''): if inventory in (None, ''):
return None # Do not change inventory if no inventory value provided return None # Do not change inventory if no inventory value provided
...@@ -205,7 +208,8 @@ Une ligne tarifaire.""" ...@@ -205,7 +208,8 @@ Une ligne tarifaire."""
mapped_value_property_list = ('inventory', 'price',), mapped_value_property_list = ('inventory', 'price',),
predicate_operator = 'SUPERSET_OF', predicate_operator = 'SUPERSET_OF',
predicate_value = filter(lambda k_item: k_item is not None, k), predicate_value = filter(lambda k_item: k_item is not None, k),
variation_category_list = filter(lambda k_item: k_item is not None, k) variation_category_list = filter(lambda k_item: k_item is not None, k),
force_update = 1
) )
c.flushActivity(invoke=1) c.flushActivity(invoke=1)
else: else:
......
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