[Erp5-report] r13513 - in /erp5/trunk/bt5/erp5_banking_check: SkinTemplateItem/portal_skins...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Mar 20 10:51:54 CET 2007
Author: vincent
Date: Tue Mar 20 10:51:42 2007
New Revision: 13513
URL: http://svn.erp5.org?rev=13513&view=rev
Log:
Factorise & simplify code.
Remove logs.
Modified:
erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_getBaobabSource.xml
erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckSale_getBaobabSource.xml
erp5/trunk/bt5/erp5_banking_check/bt/revision
Modified: erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_getBaobabSource.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_getBaobabSource.xml?rev=13513&r1=13512&r2=13513&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_getBaobabSource.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_getBaobabSource.xml Tue Mar 20 10:51:42 2007
@@ -68,32 +68,16 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string># first get the source of the document,\n
-# we will need to add the counter\n
+ <value> <string>user_id = context.Base_getLastUserIdByTransition(workflow_id=\'check_payment_workflow\', transition_id=\'deliver_action\')\n
+if user_id is None:\n
+ return None\n
+site_list = context.Baobab_getUserAssignedSiteList(user_id=user_id)\n
source = context.getSource()\n
-baobab_source = None\n
-context.log(\'baobab_source\', baobab_source)\n
-# Get the history of the workflow\n
-user_id=\'None\'\n
-context.log(\'workflow_item_list:\',context.Base_getWorkflowHistoryItemList(\'check_payment_workflow\',display=0))\n
-for workflow_item in context.Base_getWorkflowHistoryItemList(\'check_payment_workflow\',display=0):\n
- context.log(\'workflow_item.getProperty(action)\',workflow_item.getProperty(\'action\'))\n
- if workflow_item.getProperty(\'action\')==\'deliver_action\':\n
- user_id=workflow_item.getProperty(\'actor\')\n
-context.log(\'user_id\',user_id)\n
-site_list = context.Baobab_getUserAssignedSiteList(user_id=user_id)\n
-context.log(\'CheckPayment_getBaobabSource site_list\',site_list)\n
for site in site_list:\n
site_value = context.portal_categories.getCategoryValue(site)\n
- context.log(\'site\', site)\n
if site_value.getVaultType().endswith(\'guichet\') and source in site:\n
- baobab_source = site + \'/encaisse_des_billets_et_monnaies/sortante\'\n
- break\n
- context.log(\'baobab_source\', baobab_source)\n
- \n
- \n
-context.log(\'baobab_source\', baobab_source)\n
-return baobab_source\n
+ return site + \'/encaisse_des_billets_et_monnaies/sortante\'\n
+return None\n
</string> </value>
</item>
<item>
@@ -145,13 +129,11 @@
<string>kw</string>
<string>_getattr_</string>
<string>context</string>
+ <string>user_id</string>
+ <string>None</string>
+ <string>site_list</string>
<string>source</string>
- <string>None</string>
- <string>baobab_source</string>
- <string>user_id</string>
<string>_getiter_</string>
- <string>workflow_item</string>
- <string>site_list</string>
<string>site</string>
<string>site_value</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckSale_getBaobabSource.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckSale_getBaobabSource.xml?rev=13513&r1=13512&r2=13513&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckSale_getBaobabSource.xml (original)
+++ erp5/trunk/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckSale_getBaobabSource.xml Tue Mar 20 10:51:42 2007
@@ -69,29 +69,17 @@
<item>
<key> <string>_body</string> </key>
<value> <string>source = context.getSource()\n
-if source != None:\n
+if source is not None:\n
return source\n
-else:\n
- # calculate the source\n
- user_site = None\n
- # must use owner to know site letter\n
- group_list = context.get_local_roles()\n
- for group, role_list in group_list:\n
- if \'Owner\' in role_list:\n
- user_id = group\n
-\n
- site_list = context.Baobab_getUserAssignedSiteList(user_id=user_id)\n
- user_site = None\n
- for site in site_list:\n
- site_value = context.portal_categories.getCategoryValue(site)\n
- context.log(\'site_value\',site_value)\n
- if site_value.getVaultType().endswith(\'guichet\'):\n
- user_site = site + \'/encaisse_des_billets_et_monnaies\'\n
- if user_site is None:\n
- from Products.ERP5Type.Message import Message\n
- message = Message(domain="ui", message="The owner is not assigned to the right vault.")\n
- raise ValueError,message\n
- return user_site\n
+# calculate the source\n
+# must use owner to know site letter\n
+site_list = context.Baobab_getUserAssignedSiteList(user_id=context.Base_getOwnerId())\n
+for site in site_list:\n
+ if context.portal_categories.getCategoryValue(site).getVaultType().endswith(\'guichet\'):\n
+ return site + \'/encaisse_des_billets_et_monnaies\'\n
+from Products.ERP5Type.Message import Message\n
+message = Message(domain="ui", message="The owner is not assigned to the right vault.")\n
+raise ValueError,message\n
</string> </value>
</item>
<item>
@@ -146,15 +134,9 @@
<string>context</string>
<string>source</string>
<string>None</string>
- <string>user_site</string>
- <string>group_list</string>
+ <string>site_list</string>
<string>_getiter_</string>
- <string>group</string>
- <string>role_list</string>
- <string>user_id</string>
- <string>site_list</string>
<string>site</string>
- <string>site_value</string>
<string>Products.ERP5Type.Message</string>
<string>Message</string>
<string>message</string>
Modified: erp5/trunk/bt5/erp5_banking_check/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_check/bt/revision?rev=13513&r1=13512&r2=13513&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_check/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_check/bt/revision Tue Mar 20 10:51:42 2007
@@ -1,1 +1,1 @@
-112
+114
More information about the Erp5-report
mailing list