diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getMessageTag.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getMessageTag.xml index 7002b0db657eaad16e91f542bf326e592d48e851..9f09f85db8f40302cb0d0470ab8c6a5708440784 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getMessageTag.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getMessageTag.xml @@ -93,6 +93,14 @@ return \'bank_account_%s\' % (reference, )\n <key> <string>_params</string> </key> <value> <string>bank_account</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> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getAgencyForSite.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getAgencyForSite.xml index d57600832840bea049ce7f9cc4438d376773903b..0f3f1630b66eb29d168dc9a466f49aa2a113a11c 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getAgencyForSite.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getAgencyForSite.xml @@ -70,7 +70,7 @@ \n orga_id = "site_%3s" %(site.getCodification())\n org = context.organisation_module[orga_id]\n -context.log(\'org\',org)\n +\n return org\n </string> </value> </item> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_checkBaobabSourceAndDestination.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_checkBaobabSourceAndDestination.xml index 22de00d38dff93006f4705a29723e8d26ba422ee..99f33152b01b5bd16e3a30d74d700d16564d5ef5 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_checkBaobabSourceAndDestination.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_checkBaobabSourceAndDestination.xml @@ -70,9 +70,8 @@ from Products.ERP5Type.Message import Message\n \n object_to_check_list = [context]\n object_to_check_list.extend(context.getMovementList())\n -context.log("object to check", object_to_check_list)\n +\n for object in object_to_check_list:\n - context.log("object", object)\n baobab_source = object.getBaobabSource()\n baobab_destination = object.getBaobabDestination()\n \n diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getResourceInformationDictFromUrlAndVariation.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getResourceInformationDictFromUrlAndVariation.xml index 3d7d034644954ab228a7fb15a6e1bc96694f9825..cd0ccfa49a06eb91f10f749e94f689cc220ca946 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getResourceInformationDictFromUrlAndVariation.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getResourceInformationDictFromUrlAndVariation.xml @@ -153,9 +153,7 @@ if movement is not None: # case of history\n # resource_dict[\'simulation_state_title\'] = movement.getTranslatedSimulationStateTitle()\n # resource_dict[\'explanation_translated_relative_url\'] = "%s/%s" % \\\n # (explanation_value.getTranslatedPortalType(),source_reference)\n -# context.log("explanation_uid", explanation_uid)\n catalog_explanation = cache_dict[\'cache_explanation\'][explanation_uid]\n -# context.log("explanation_uid url", catalog_explanation.relative_url)\n resource_dict[\'explanation_relative_url\'] = catalog_explanation.relative_url\n source_reference = catalog_explanation.source_reference\n resource_dict[\'source_reference\'] = catalog_explanation.source_reference\n diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/states/cancelled.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/states/cancelled.xml index be61355488822185c8af2836b8dfec43859b916e..b19e92627aa0df4c4efd94bca47235d7a6ae93cf 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/states/cancelled.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/states/cancelled.xml @@ -29,6 +29,12 @@ <key> <string>id</string> </key> <value> <string>cancelled</string> </value> </item> + <item> + <key> <string>permission_roles</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> <item> <key> <string>title</string> </key> <value> <string>Cancelled</string> </value> @@ -48,4 +54,55 @@ </dictionary> </pickle> </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <global name="PersistentMapping" module="Persistence.mapping"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>data</string> </key> + <value> + <dictionary> + <item> + <key> <string>AccessContentsInformation</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Manager</string> + </tuple> + </value> + </item> + <item> + <key> <string>Delete objects</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>Modify portal content</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>View</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Manager</string> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/stopped.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/stopped.xml index 9f820e2a13b86439b826e717705e9aa3f7be0542..16f187e76d6babfcfce7b2deb2fd1e23f9efcdc0 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/stopped.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/stopped.xml @@ -64,12 +64,40 @@ <key> <string>data</string> </key> <value> <dictionary> + <item> + <key> <string>Access contents information</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Manager</string> + </tuple> + </value> + </item> <item> <key> <string>Delete objects</string> </key> <value> <tuple/> </value> </item> + <item> + <key> <string>Modify portal content</string> </key> + <value> + <tuple> + <string>Manager</string> + </tuple> + </value> + </item> + <item> + <key> <string>View</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Manager</string> + </tuple> + </value> + </item> </dictionary> </value> </item> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/states/draft.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/states/draft.xml index 478af59034ea91a94139616be6fb97572369b0a0..942844189e40e3f6d21b59fc25b1f83347677a37 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/states/draft.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/states/draft.xml @@ -38,6 +38,7 @@ <value> <tuple> <string>confirm</string> + <string>delete</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/cancelled.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/cancelled.xml index fba8515a3c2b50593ac8004d4cda7023b77ce9fe..ba4dc86281ce63fdf0f095964268db21b388ce73 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/cancelled.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/cancelled.xml @@ -15,10 +15,85 @@ <none/> </value> </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>id</string> </key> <value> <string>cancelled</string> </value> </item> + <item> + <key> <string>permission_roles</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Cancelled</string> </value> + </item> + <item> + <key> <string>transitions</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>type_list</string> </key> + <value> + <tuple/> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <global name="PersistentMapping" module="Persistence.mapping"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>data</string> </key> + <value> + <dictionary> + <item> + <key> <string>AccessContentsInformation</string> </key> + <value> + <tuple> + <string>Assignor</string> + <string>Manager</string> + </tuple> + </value> + </item> + <item> + <key> <string>Delete objects</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>Modify portal content</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>View</string> </key> + <value> + <tuple> + <string>Assignor</string> + <string>Manager</string> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> </dictionary> </pickle> </record> 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 175aa4a058e480e68811dafd4a62c984ad79823f..aaf0a8de31c0c1d4e2554b0c696adf62427bacb2 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 @@ -83,7 +83,9 @@ <item> <key> <string>Modify portal content</string> </key> <value> - <tuple/> + <tuple> + <string>Manager</string> + </tuple> </value> </item> <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 a1e3359ec283e55b4c484c0d5514ed2e13bfdf94..6be5bd3f7914d0fd803972356a9c3557385cf695 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 @@ -83,7 +83,9 @@ <item> <key> <string>Modify portal content</string> </key> <value> - <tuple/> + <tuple> + <string>Manager</string> + </tuple> </value> </item> <item> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/currency_exchange_line_workflow/scripts/checkSingleExchangeLine.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/currency_exchange_line_workflow/scripts/checkSingleExchangeLine.xml index 9990eea6be0133f2eb200bd1269094b6443a0609..7f1577fe3dd3e51923d39ca54f773f9c4fa4c8dc 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/currency_exchange_line_workflow/scripts/checkSingleExchangeLine.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/currency_exchange_line_workflow/scripts/checkSingleExchangeLine.xml @@ -67,6 +67,11 @@ <key> <string>_body</string> </key> <value> <string encoding="cdata"><![CDATA[ +from Products.DCWorkflow.DCWorkflow import ValidationFailed\n +from Products.ERP5Type.Message import Message\n +from DateTime import DateTime\n +\n +\n exchange_line = state_change[\'object\']\n \n # In this script, we will make sure it is impossible to get two \n @@ -76,9 +81,6 @@ if exchange_line.getBasePrice() in (None, 0, 0.0):\n msg = Message(domain = \'ui\', message = \'Sorry, you must define a fixing price.\')\n raise ValidationFailed, (msg,)\n \n -from Products.DCWorkflow.DCWorkflow import ValidationFailed\n -from Products.ERP5Type.Message import Message\n -from DateTime import DateTime\n \n # We have to looking for other currency exchanges lines\n from Products.ERP5Type.Document import newTempBase\n @@ -160,16 +162,16 @@ for line in line_list:\n <tuple> <string>state_change</string> <string>kw</string> + <string>Products.DCWorkflow.DCWorkflow</string> + <string>ValidationFailed</string> + <string>Products.ERP5Type.Message</string> + <string>Message</string> + <string>DateTime</string> <string>_getitem_</string> <string>exchange_line</string> <string>_getattr_</string> <string>None</string> - <string>Message</string> <string>msg</string> - <string>ValidationFailed</string> - <string>Products.DCWorkflow.DCWorkflow</string> - <string>Products.ERP5Type.Message</string> - <string>DateTime</string> <string>Products.ERP5Type.Document</string> <string>newTempBase</string> <string>context</string> diff --git a/bt5/erp5_banking_core/bt/revision b/bt5/erp5_banking_core/bt/revision index 9ec873d37d5000c0c6f4879ac80d965e3cbd6ac1..ce163e7b6b4b7eef56c4445149326a929a7a7e3e 100644 --- a/bt5/erp5_banking_core/bt/revision +++ b/bt5/erp5_banking_core/bt/revision @@ -1 +1 @@ -438 \ No newline at end of file +440 \ No newline at end of file