diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_checkResourceCategoryList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_checkResourceCategoryList.xml index 2e421ec263457cc0aad4ae654c7a73f34e5513e8..c2aa065fa342d3d0d795192acd6e6060b5e26ef2 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_checkResourceCategoryList.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_checkResourceCategoryList.xml @@ -71,7 +71,7 @@ <value> <string>def getResourceVariationCategory():\n pass\n \n -if variation != \'variation/not_defined\' and variation.lstrip(\'variation/\') not in resource_object.getVariationList():\n +if variation != \'variation/not_defined\' and variation.replace(\'variation/\',\'\') not in resource_object.getVariationList():\n variation_not_defined = 1\n break\n </string> </value> @@ -102,7 +102,7 @@ if variation != \'variation/not_defined\' and variation.lstrip(\'variation/\') n <key> <string>errors</string> </key> <value> <tuple> - <string>\'break\' outside loop (/baobab/portal_skins/erp5_banking_core/CashDetail_checkResourceCategoryList, 6)</string> + <string>\'break\' outside loop (Script (Python), 6)</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_saveFastInputLine.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_saveFastInputLine.xml index f116d93a9e3fa7c473d1ac4969f8ba4ba1eb8570..5398bab8cf1ab7879631ea6b4fbab50b3e31e8d2 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_saveFastInputLine.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_saveFastInputLine.xml @@ -195,11 +195,11 @@ for resource_id in per_resource_dict.keys():\n variation = variation[\'variation\']\n # check if variation exist for the resource\n if column_base_category == "variation":\n - if variation != \'variation/not_defined\' and variation.lstrip(\'variation/\') not in resource_object.getVariationList():\n + if variation != \'variation/not_defined\' and variation.replace(\'variation/\',\'\') not in resource_object.getVariationList():\n variation_not_defined = 1\n break\n # for the letter, if coin, must always be not_defined\n - if letter != \'emission_letter/not_defined\' and letter.lstrip(\'emission_letter/\') not in resource_object.getEmissionLetterList():\n + if letter != \'emission_letter/not_defined\' and letter.replace(\'emission_letter/\',\'\') not in resource_object.getEmissionLetterList():\n old_letter = letter\n letter = \'emission_letter/not_defined\'\n # replace key in per_resource_dict\n @@ -288,7 +288,7 @@ if variation_not_defined:\n if len(old_line)>0:\n for object_list in old_line:\n context.deleteContent(object_list.getId())\n - message = N_("$title doesn\'t exist for $variation", mapping = {\'title\':resource_object.getTranslatedTitle(), \'variation\':variation.lstrip(\'variation/\')})\n + message = N_("$title doesn\'t exist for $variation", mapping = {\'title\':resource_object.getTranslatedTitle(), \'variation\':variation.replace(\'variation/\',\'\')})\n redirect_url = \'%s/view?%s\' % ( context.absolute_url()\n , "portal_status_message=%s" %message\n )\n diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/worklists/draft.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/worklists/draft.xml deleted file mode 100644 index a2684d77f001114619d5818e13975517ece2d4b1..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/worklists/draft.xml +++ /dev/null @@ -1,112 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Worklists</string> - <string>WorklistDefinition</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>actbox_category</string> </key> - <value> <string>global</string> </value> - </item> - <item> - <key> <string>actbox_name</string> </key> - <value> <string>Drafts To Validate (%(count)s)</string> </value> - </item> - <item> - <key> <string>actbox_url</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -Base_viewWorklist?simulation_state=draft&portal_type=Check&reset=1 - -]]></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>guard</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>draft</string> </value> - </item> - <item> - <key> <string>var_matches</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_container</string> </key> - <value> - <dictionary> - <item> - <key> <string>check_payment_state</string> </key> - <value> - <tuple> - <string>draft</string> - </tuple> - </value> - </item> - <item> - <key> <string>portal_type</string> </key> - <value> - <tuple> - <string>Check</string> - </tuple> - </value> - </item> - <item> - <key> <string>simulation_state</string> </key> - <value> - <tuple> - <string>draft</string> - </tuple> - </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/closed.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/closed.xml index 80474a417b622497c1d82388e2a978d668c46937..a47418e18990d175bc456b5aafca3a1ec6a98ca9 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/closed.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/closed.xml @@ -76,16 +76,14 @@ <tuple> <string>Assignor</string> <string>Manager</string> + <string>Reviewer</string> </tuple> </value> </item> <item> <key> <string>Modify portal content</string> </key> <value> - <tuple> - <string>Assignor</string> - <string>Manager</string> - </tuple> + <tuple/> </value> </item> <item> @@ -94,6 +92,7 @@ <tuple> <string>Assignor</string> <string>Manager</string> + <string>Reviewer</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/open.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/open.xml index c56bdc41536759525ded5ad9c3fd66807b961efb..568db559d63b93133766ebf25d75fa7bb901f663 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/open.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/open.xml @@ -76,7 +76,7 @@ <tuple> <string>Assignor</string> <string>Manager</string> - <string>Member</string> + <string>Reviewer</string> </tuple> </value> </item> @@ -84,7 +84,6 @@ <key> <string>Modify portal content</string> </key> <value> <tuple> - <string>Assignor</string> <string>Manager</string> </tuple> </value> @@ -95,7 +94,7 @@ <tuple> <string>Assignor</string> <string>Manager</string> - <string>Member</string> + <string>Reviewer</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_core/bt/revision b/bt5/erp5_banking_core/bt/revision index 8bc6583717d617da1f8bf8bbaa7c16c25ef17113..3fdc173dabdd1038c973c374ec30f55cfddafdfb 100644 --- a/bt5/erp5_banking_core/bt/revision +++ b/bt5/erp5_banking_core/bt/revision @@ -1 +1 @@ -120 \ No newline at end of file +122 \ No newline at end of file