From 956fe3db9ca8a0df8aaa13df36642cae2b0849af Mon Sep 17 00:00:00 2001 From: Yusei Tahara <yusei@nexedi.com> Date: Wed, 27 Oct 2010 11:56:01 +0000 Subject: [PATCH] 2010-10-27 yusei * Fix invoice_workflow. Some user-action transitions were missing. Permission settings on started and stopped states were missing. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@39560 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../invoice_workflow/states/confirmed.xml | 11 +-- .../invoice_workflow/states/started.xml | 82 ++++++++++++++++++- .../invoice_workflow/states/stopped.xml | 76 ++++++++++++++++- bt5/erp5_advanced_invoicing/bt/change_log | 3 + bt5/erp5_advanced_invoicing/bt/revision | 2 +- 5 files changed, 157 insertions(+), 17 deletions(-) diff --git a/bt5/erp5_advanced_invoicing/WorkflowTemplateItem/portal_workflow/invoice_workflow/states/confirmed.xml b/bt5/erp5_advanced_invoicing/WorkflowTemplateItem/portal_workflow/invoice_workflow/states/confirmed.xml index fa2267abf7..91fae9a72e 100644 --- a/bt5/erp5_advanced_invoicing/WorkflowTemplateItem/portal_workflow/invoice_workflow/states/confirmed.xml +++ b/bt5/erp5_advanced_invoicing/WorkflowTemplateItem/portal_workflow/invoice_workflow/states/confirmed.xml @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="StateDefinition" module="Products.DCWorkflow.States"/> - <tuple/> - </tuple> + <global name="StateDefinition" module="Products.DCWorkflow.States"/> </pickle> <pickle> <dictionary> @@ -36,6 +33,7 @@ <string>start</string> <string>start_action</string> <string>stop</string> + <string>stop_action</string> </tuple> </value> </item> @@ -50,10 +48,7 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <global name="PersistentMapping" module="Persistence.mapping"/> - <tuple/> - </tuple> + <global name="PersistentMapping" module="Persistence.mapping"/> </pickle> <pickle> <dictionary> diff --git a/bt5/erp5_advanced_invoicing/WorkflowTemplateItem/portal_workflow/invoice_workflow/states/started.xml b/bt5/erp5_advanced_invoicing/WorkflowTemplateItem/portal_workflow/invoice_workflow/states/started.xml index 297b7ccdbf..f4e7e17a10 100644 --- a/bt5/erp5_advanced_invoicing/WorkflowTemplateItem/portal_workflow/invoice_workflow/states/started.xml +++ b/bt5/erp5_advanced_invoicing/WorkflowTemplateItem/portal_workflow/invoice_workflow/states/started.xml @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="StateDefinition" module="Products.DCWorkflow.States"/> - <tuple/> - </tuple> + <global name="StateDefinition" module="Products.DCWorkflow.States"/> </pickle> <pickle> <dictionary> @@ -17,6 +14,12 @@ <key> <string>id</string> </key> <value> <string>started</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>Started</string> </value> @@ -41,4 +44,75 @@ </dictionary> </pickle> </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="PersistentMapping" module="Persistence.mapping"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>data</string> </key> + <value> + <dictionary> + <item> + <key> <string>Access contents information</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Associate</string> + <string>Auditor</string> + <string>Manager</string> + <string>Owner</string> + </tuple> + </value> + </item> + <item> + <key> <string>Add portal content</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> + <string>Assignee</string> + <string>Assignor</string> + <string>Manager</string> + </tuple> + </value> + </item> + <item> + <key> <string>Modify portal content</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Manager</string> + </tuple> + </value> + </item> + <item> + <key> <string>View</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Associate</string> + <string>Auditor</string> + <string>Manager</string> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_advanced_invoicing/WorkflowTemplateItem/portal_workflow/invoice_workflow/states/stopped.xml b/bt5/erp5_advanced_invoicing/WorkflowTemplateItem/portal_workflow/invoice_workflow/states/stopped.xml index 5a8c8a4623..1aebe4c813 100644 --- a/bt5/erp5_advanced_invoicing/WorkflowTemplateItem/portal_workflow/invoice_workflow/states/stopped.xml +++ b/bt5/erp5_advanced_invoicing/WorkflowTemplateItem/portal_workflow/invoice_workflow/states/stopped.xml @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="StateDefinition" module="Products.DCWorkflow.States"/> - <tuple/> - </tuple> + <global name="StateDefinition" module="Products.DCWorkflow.States"/> </pickle> <pickle> <dictionary> @@ -17,6 +14,12 @@ <key> <string>id</string> </key> <value> <string>stopped</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>Stopped</string> </value> @@ -41,4 +44,69 @@ </dictionary> </pickle> </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="PersistentMapping" module="Persistence.mapping"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>data</string> </key> + <value> + <dictionary> + <item> + <key> <string>Access contents information</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Associate</string> + <string>Auditor</string> + <string>Manager</string> + <string>Owner</string> + </tuple> + </value> + </item> + <item> + <key> <string>Add portal content</string> </key> + <value> + <tuple> + <string>Manager</string> + </tuple> + </value> + </item> + <item> + <key> <string>Delete objects</string> </key> + <value> + <tuple> + <string>Manager</string> + </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>Associate</string> + <string>Auditor</string> + <string>Manager</string> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_advanced_invoicing/bt/change_log b/bt5/erp5_advanced_invoicing/bt/change_log index 18927b4ba5..17254f3050 100644 --- a/bt5/erp5_advanced_invoicing/bt/change_log +++ b/bt5/erp5_advanced_invoicing/bt/change_log @@ -1,3 +1,6 @@ +2010-10-27 yusei +* Fix invoice_workflow. Some user-action transitions were missing. Permission settings on started and stopped states were missing. + 2010-06-15 yusei * Fix plan transition on invoice_workflow. Appropriate root applied rule must be made. diff --git a/bt5/erp5_advanced_invoicing/bt/revision b/bt5/erp5_advanced_invoicing/bt/revision index 27a37eb577..bd753ccc4b 100644 --- a/bt5/erp5_advanced_invoicing/bt/revision +++ b/bt5/erp5_advanced_invoicing/bt/revision @@ -1 +1 @@ -93 \ No newline at end of file +94 \ No newline at end of file -- 2.30.9