Commit ec07d8c2 authored by Aurel's avatar Aurel

2006-07-20 aurel

* do not get site letter from owner but from source

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@8639 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent da7d476a
No related merge requests found
......@@ -72,14 +72,16 @@
return None\n
\n
# must use owner to know site letter\n
old_group_list = context.get_local_roles()\n
for group, role_list in old_group_list:\n
if \'Owner\' in role_list:\n
user = group\n
#old_group_list = context.get_local_roles()\n
#for group, role_list in old_group_list:\n
# if \'Owner\' in role_list:\n
# user = group\n
\n
site_letter = context.getSourceValue().getCodification()[0].lower()\n
#site_letter = context.Baobab_getUserEmissionLetterList(user)\n
site = context.Baobab_getVaultSite(context.getSource()).getRelativeUrl()\n
context.log("user, site", str((user, site)))\n
if context.getCashStatus() == \'to_sort\' or context.getCashStatus() == \'cancelled\' and context.getEmissionLetter() in context.Baobab_getUserEmissionLetterList(user):\n
\n
if context.getCashStatus() == \'to_sort\' or context.getCashStatus() == \'cancelled\' and context.getEmissionLetter() in site_letter:\n
# remaining banknote which are not sorted yet, or cancelled one\n
if not \'ventilation\' in context.getSource():\n
return \'%s/caveau/auxiliaire/encaisse_des_billets_et_monnaies\' %(site,)\n
......@@ -87,7 +89,7 @@ if context.getCashStatus() == \'to_sort\' or context.getCashStatus() == \'cancel
# take classification into account here\n
source_list = context.getSource().split(\'/\')\n
return \'%s/caveau/auxiliaire/%s\' %(site,\'/\'.join(source_list[-2:]))\n
elif context.getEmissionLetter() in context.Baobab_getUserEmissionLetterList(user):\n
elif context.getEmissionLetter() in site_letter:\n
return \'%s/caveau/reserve/encaisse_des_billets_et_monnaies\' %(site,)\n
else:\n
return \'%s/caveau/externes/encaisse_des_externes\' %(site,)\n
......@@ -148,15 +150,10 @@ else:\n
<string>_getattr_</string>
<string>context</string>
<string>None</string>
<string>old_group_list</string>
<string>_getiter_</string>
<string>group</string>
<string>role_list</string>
<string>user</string>
<string>_getitem_</string>
<string>site_letter</string>
<string>site</string>
<string>str</string>
<string>source_list</string>
<string>_getitem_</string>
</tuple>
</value>
</item>
......
2006-07-20 aurel
* do not get site letter from owner but from source
2006-07-19 aurel
* define 'add portal content' permission on cash sorting workflow
......
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