From 5e55254b95deec6fbfcc5c3933513725667d292b Mon Sep 17 00:00:00 2001 From: Sebastien Robin <seb@nexedi.com> Date: Thu, 20 Sep 2007 09:08:12 +0000 Subject: [PATCH] fixed several worklists git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16493 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../Checkbook%20Reception/fastInput.xml | 2 +- .../scripts/validateConsistency.xml | 1 - .../worklists/planned.xml | 113 +++++++++++++++++ ...ckbook_delivery_worklist.xml => draft.xml} | 36 ++++-- .../worklists/empty.xml | 114 ++++++++++++++++++ .../worklists/confirmed.xml | 4 +- .../worklists/ordered.xml | 4 +- bt5/erp5_banking_check/bt/revision | 2 +- 8 files changed, 260 insertions(+), 16 deletions(-) create mode 100644 bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/worklists/planned.xml rename bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/worklists/{checkbook_delivery_worklist.xml => draft.xml} (76%) create mode 100644 bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/worklists/empty.xml diff --git a/bt5/erp5_banking_check/ActionTemplateItem/portal_types/Checkbook%20Reception/fastInput.xml b/bt5/erp5_banking_check/ActionTemplateItem/portal_types/Checkbook%20Reception/fastInput.xml index 2dda3f10f5..e2ae62af45 100644 --- a/bt5/erp5_banking_check/ActionTemplateItem/portal_types/Checkbook%20Reception/fastInput.xml +++ b/bt5/erp5_banking_check/ActionTemplateItem/portal_types/Checkbook%20Reception/fastInput.xml @@ -95,7 +95,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>python:object.getSimulationState() in (\'empty\', \'rejected\') and not object.isImport()</string> </value> + <value> <string>python:object.getSimulationState() in (\'empty\', \'rejected\') and not object.isImported()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml index 74f90e7e38..4135fcf2d0 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.xml @@ -75,7 +75,6 @@ transaction = state_change[\'object\']\n \n site = transaction.getSite()\n date = transaction.getStartDate()\n -transaction.Baobab_checkCounterDateOpen(site=site, date=date)\n transaction.Baobab_checkAccountingDateOpen(site=site, date=date)\n \n # Check the amount.\n diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/worklists/planned.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/worklists/planned.xml new file mode 100644 index 0000000000..946d8e7713 --- /dev/null +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/worklists/planned.xml @@ -0,0 +1,113 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</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>Consistency Verified (%(count)s)</string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +Base_viewWorklist?simulation_state=planned&portal_type=Check Payment&reset=1 + +]]></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string>Consistency Verified</string> </value> + </item> + <item> + <key> <string>guard</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>planned</string> </value> + </item> + <item> + <key> <string>var_matches</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <global name="Guard" module="Products.DCWorkflow.Guard"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>roles</string> </key> + <value> + <tuple> + <string>Manager</string> + <string>Assignee</string> + </tuple> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <global name="PersistentMapping" module="Persistence.mapping"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>data</string> </key> + <value> + <dictionary> + <item> + <key> <string>portal_type</string> </key> + <value> + <tuple> + <string>Check Payment</string> + </tuple> + </value> + </item> + <item> + <key> <string>simulation_state</string> </key> + <value> + <tuple> + <string>planned</string> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/worklists/checkbook_delivery_worklist.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/worklists/draft.xml similarity index 76% rename from bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/worklists/checkbook_delivery_worklist.xml rename to bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/worklists/draft.xml index 7d8f0868c1..548333e71a 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/worklists/checkbook_delivery_worklist.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/worklists/draft.xml @@ -44,17 +44,17 @@ Base_viewWorklist?simulation_state=draft&reset=1&portal_type=Checkbook Delivery <item> <key> <string>guard</string> </key> <value> - <none/> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>checkbook_delivery_worklist</string> </value> + <value> <string>draft</string> </value> </item> <item> <key> <string>var_matches</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> </item> </dictionary> @@ -63,17 +63,35 @@ Base_viewWorklist?simulation_state=draft&reset=1&portal_type=Checkbook Delivery <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> + <global name="Guard" module="Products.DCWorkflow.Guard"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>roles</string> </key> + <value> + <tuple> + <string>Assignor</string> + <string>Manager</string> + </tuple> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <global name="PersistentMapping" module="Persistence.mapping"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> - <key> <string>_container</string> </key> + <key> <string>data</string> </key> <value> <dictionary> <item> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/worklists/empty.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/worklists/empty.xml new file mode 100644 index 0000000000..4fe286e68f --- /dev/null +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/worklists/empty.xml @@ -0,0 +1,114 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</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>Empty to Validate (%(count)s)</string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +Base_viewWorklist?simulation_state=confirmed&portal_type=Checkbook Delivery&reset=1 + +]]></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string>Empty to Validate</string> </value> + </item> + <item> + <key> <string>guard</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>empty</string> </value> + </item> + <item> + <key> <string>var_matches</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <global name="Guard" module="Products.DCWorkflow.Guard"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>roles</string> </key> + <value> + <tuple> + <string>Assistant</string> + <string>Assignor</string> + <string>Manager</string> + </tuple> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <global name="PersistentMapping" module="Persistence.mapping"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>data</string> </key> + <value> + <dictionary> + <item> + <key> <string>portal_type</string> </key> + <value> + <tuple> + <string>Checkbook Delivery</string> + </tuple> + </value> + </item> + <item> + <key> <string>simulation_state</string> </key> + <value> + <tuple> + <string>empty</string> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/worklists/confirmed.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/worklists/confirmed.xml index 31ff6081d2..c1e2bf68bd 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/worklists/confirmed.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/worklists/confirmed.xml @@ -21,7 +21,7 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Vault Transfers To Validate (%(count)s)</string> </value> + <value> <string>Checkbook Vault Transfers To Validate (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> @@ -33,7 +33,7 @@ Base_viewWorklist?simulation_state=confirmed&reset=1&portal_type=Checkbook Vault </item> <item> <key> <string>description</string> </key> - <value> <string>Vault Transfers To Validate By Destination Controler</string> </value> + <value> <string>Checkbook Vault Transfers To Validate By Destination Controler</string> </value> </item> <item> <key> <string>guard</string> </key> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/worklists/ordered.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/worklists/ordered.xml index ae08c3dd90..df9207c6d3 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/worklists/ordered.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/worklists/ordered.xml @@ -21,7 +21,7 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Vault Transfers To Validate (%(count)s)</string> </value> + <value> <string>Checkbook Vault Transfers To Validate (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> @@ -33,7 +33,7 @@ Base_viewWorklist?simulation_state=ordered&reset=1&portal_type=Checkbook Vault T </item> <item> <key> <string>description</string> </key> - <value> <string>Vault Transfers To Validate By Destination Manager</string> </value> + <value> <string>Checkbook Vault Transfers To Validate By Destination Manager</string> </value> </item> <item> <key> <string>guard</string> </key> diff --git a/bt5/erp5_banking_check/bt/revision b/bt5/erp5_banking_check/bt/revision index 9d239ff807..87d78b292a 100644 --- a/bt5/erp5_banking_check/bt/revision +++ b/bt5/erp5_banking_check/bt/revision @@ -1 +1 @@ -321 \ No newline at end of file +322 \ No newline at end of file -- 2.30.9