From 84d0b47cba6054e3956ebde2cb1559d8fb5e811c Mon Sep 17 00:00:00 2001 From: Mame Coumba Sall <mame@nexedi.com> Date: Wed, 6 Jan 2010 19:43:18 +0000 Subject: [PATCH] Modified script so that if getQuantity() is not None, its value is returned instead of None git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31609 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_banking_core/Base_getAssignorId.xml | 142 ++++++++++++++++++ .../CurrencyPurchase_getQuantity.xml | 6 +- bt5/erp5_banking_core/bt/revision | 2 +- 3 files changed, 148 insertions(+), 2 deletions(-) create mode 100644 bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getAssignorId.xml diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getAssignorId.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getAssignorId.xml new file mode 100644 index 0000000000..cd6f26660d --- /dev/null +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getAssignorId.xml @@ -0,0 +1,142 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>Script_magic</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>_bind_names</string> </key> + <value> + <object> + <klass> + <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>_asgns</string> </key> + <value> + <dictionary> + <item> + <key> <string>name_container</string> </key> + <value> <string>container</string> </value> + </item> + <item> + <key> <string>name_context</string> </key> + <value> <string>context</string> </value> + </item> + <item> + <key> <string>name_m_self</string> </key> + <value> <string>script</string> </value> + </item> + <item> + <key> <string>name_subpath</string> </key> + <value> <string>traverse_subpath</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>_body</string> </key> + <value> <string>from AccessControl import getSecurityManager\n +u=getSecurityManager().getUser()\n +role_list = u.getRolesInContext(context)\n +if \'Assignor\' in role_list:\n + return True\n +else:\n + return False\n +</string> </value> + </item> + <item> + <key> <string>_code</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>_proxy_roles</string> </key> + <value> + <tuple> + <string>Manager</string> + </tuple> + </value> + </item> + <item> + <key> <string>errors</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>func_code</string> </key> + <value> + <object> + <klass> + <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>co_argcount</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>co_varnames</string> </key> + <value> + <tuple> + <string>AccessControl</string> + <string>getSecurityManager</string> + <string>_getattr_</string> + <string>u</string> + <string>context</string> + <string>role_list</string> + <string>True</string> + <string>False</string> + </tuple> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>func_defaults</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>Base_getAssignorId</string> </value> + </item> + <item> + <key> <string>warnings</string> </key> + <value> + <tuple/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml index 90b1f42a43..4c30248808 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml @@ -77,7 +77,10 @@ if commission_price is not None:\n quantity = price - commission_value\n quantity = round(quantity,0)\n if quantity!=context.getQuantity():\n - context.setQuantity(quantity)\n + if context.Base_getAssignorId()==False and context.getQuantity() is not None:\n + return quantity\n + else:\n + context.setQuantity(quantity)\n return quantity\n </string> </value> </item> @@ -124,6 +127,7 @@ return quantity\n <string>round</string> <string>commission_value</string> <string>quantity</string> + <string>False</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_core/bt/revision b/bt5/erp5_banking_core/bt/revision index a1a25e0f23..1fc188de73 100644 --- a/bt5/erp5_banking_core/bt/revision +++ b/bt5/erp5_banking_core/bt/revision @@ -1 +1 @@ -524 \ No newline at end of file +525 \ No newline at end of file -- 2.30.9