From b8ec6d31711166340b18d937e8ef180b7794d9f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com> Date: Wed, 26 Apr 2006 20:18:47 +0000 Subject: [PATCH] move cash transfer to usual cash transfer use cash sorting for cash classification git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6951 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...Module.xml => Cash%20Sorting%20Module.xml} | 2 +- ...0Classification.xml => Cash%20Sorting.xml} | 12 +- ...l => Incoming%20Cash%20Sorting%20Line.xml} | 4 +- .../Outgoing%20Cash%20Sorting%20Cell.xml | 117 +++++++++++ ...l => Outgoing%20Cash%20Sorting%20Line.xml} | 4 +- ...l => Usual%20Cash%20Transfer%20Module.xml} | 18 +- ...ansfer.xml => Usual%20Cash%20Transfer.xml} | 4 +- .../transitions/reject_action.xml | 100 --------- .../worklists/rejected.xml | 136 ------------ ...workflow.xml => cash_sorting_workflow.xml} | 4 +- .../scripts.xml | 0 .../scripts/validateBalance.xml | 54 ++--- .../states.xml | 0 .../states/cancelled.xml | 12 +- .../states/confirmed.xml | 21 +- .../states/delivered.xml | 115 +++++++++++ .../states/draft.xml | 17 +- .../states/ordered.xml} | 21 +- .../transitions.xml | 0 .../transitions/cancel.xml | 3 +- .../transitions/cancel_action.xml | 3 +- .../transitions/confirm.xml | 3 +- .../transitions/confirm_action.xml | 7 +- .../transitions/deliver.xml | 2 +- .../transitions/deliver_action.xml | 6 +- .../transitions/order.xml | 100 +++++++++ .../transitions/order_action.xml | 100 +++++++++ .../variables.xml | 0 .../variables/action.xml | 0 .../variables/actor.xml | 2 +- .../variables/comment.xml | 0 .../variables/error_message.xml | 0 .../variables/history.xml | 0 .../variables/portal_type.xml | 2 +- .../variables/simulation_assigned.xml | 2 +- .../variables/time.xml | 0 .../worklists.xml | 0 .../worklists/confirmed.xml | 10 +- .../worklists/draft.xml | 8 +- .../worklists/ordered.xml | 128 ++++++++++++ ...w.xml => usual_cash_transfer_workflow.xml} | 2 +- .../scripts.xml | 0 .../scripts/validateVaultBalance.xml | 0 .../states.xml | 0 .../states/cancelled.xml | 0 .../states/confirmed.xml | 0 .../states/delivered.xml | 0 .../states/draft.xml | 0 .../transitions.xml | 0 .../transitions/cancel.xml | 0 .../transitions/cancel_action.xml | 0 .../transitions/confirm.xml | 0 .../transitions/confirm_action.xml | 0 .../transitions/deliver.xml | 0 .../transitions/deliver_action.xml | 0 .../transitions/reject.xml | 0 .../transitions/reject_action.xml | 0 .../variables.xml | 0 .../variables/action.xml | 0 .../variables/actor.xml | 0 .../variables/comment.xml | 0 .../variables/error_message.xml | 0 .../variables/history.xml | 0 .../variables/portal_type.xml | 0 .../variables/time.xml | 0 .../worklists.xml | 0 .../worklists/confirmed.xml | 0 .../worklists/draft.xml | 0 bt5/erp5_banking_cash/bt/change_log | 6 + .../bt/template_action_path_list | 53 +++-- .../bt/template_module_id_list | 4 +- ...late_portal_type_allowed_content_type_list | 14 +- .../template_portal_type_base_category_list | 1 + ...plate_portal_type_hidden_content_type_list | 10 +- .../bt/template_portal_type_id_list | 13 +- .../template_portal_type_property_sheet_list | 11 +- .../template_portal_type_workflow_chain_list | 8 +- .../bt/template_workflow_id_list | 4 +- .../portal_types/Counter%20Module/list_ui.xml | 4 + .../portal_types/Counter%20Module/sort_on.xml | 4 + .../Counter%20Module/vault_report.xml | 4 + .../portal_types/Counter%20Module/view.xml | 4 + .../portal_categories/aggregate.xml} | 134 ++++++------ .../portal_categories/vault_type.xml | 18 -- .../ModuleTemplateItem/account_module.xml | 19 +- .../ModuleTemplateItem/checkbook_module.xml | 16 +- .../counter_date_module.xml | 19 +- .../ModuleTemplateItem/counter_module.xml | 19 +- .../currency_cash_module.xml | 19 +- .../foreign_check_module.xml | 19 +- .../Baobab_checkCounterDateOpen.xml | 10 +- .../Baobab_getRemainingOperationList.xml | 195 ++++++++++++++++++ .../erp5_banking_core/Baobab_getVaultSite.xml | 167 +++++++++++++++ .../Delivery_getMovementList.xml | 46 ++++- .../ImportCsvToCategories.xml | 159 +++++++++++--- .../scripts/closeAllCounter.xml | 2 +- .../scripts/cancelRemainingOperation.xml | 34 ++- .../scripts/checkDateOpened.xml | 7 +- .../bt/template_portal_type_roles_list | 3 - 99 files changed, 1399 insertions(+), 646 deletions(-) rename bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/{Cash%20Transfer%20Module.xml => Cash%20Sorting%20Module.xml} (97%) rename bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/{Cash%20Classification.xml => Cash%20Sorting.xml} (88%) rename bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/{Incoming%20Cash%20Classification%20Line.xml => Incoming%20Cash%20Sorting%20Line.xml} (94%) create mode 100644 bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Cell.xml rename bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/{Outgoing%20Cash%20Classification%20Line.xml => Outgoing%20Cash%20Sorting%20Line.xml} (94%) rename bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/{Cash%20Classification%20Module.xml => Usual%20Cash%20Transfer%20Module.xml} (91%) rename bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/{Cash%20Transfer.xml => Usual%20Cash%20Transfer.xml} (92%) delete mode 100644 bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/reject_action.xml delete mode 100644 bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/worklists/rejected.xml rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow.xml => cash_sorting_workflow.xml} (91%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/scripts.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/scripts/validateBalance.xml (77%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/states.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/states/cancelled.xml (88%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/states/confirmed.xml (84%) create mode 100644 bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/delivered.xml rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => cash_sorting_workflow}/states/draft.xml (88%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow/states/delivered.xml => cash_sorting_workflow/states/ordered.xml} (82%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/transitions.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/transitions/cancel.xml (96%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/transitions/cancel_action.xml (96%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => cash_sorting_workflow}/transitions/confirm.xml (97%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/transitions/confirm_action.xml (93%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/transitions/deliver.xml (98%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/transitions/deliver_action.xml (94%) create mode 100644 bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/order.xml create mode 100644 bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/order_action.xml rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/variables.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/variables/action.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/variables/actor.xml (97%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/variables/comment.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/variables/error_message.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/variables/history.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => cash_sorting_workflow}/variables/portal_type.xml (96%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/variables/simulation_assigned.xml (97%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/variables/time.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/worklists.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/worklists/confirmed.xml (89%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => cash_sorting_workflow}/worklists/draft.xml (91%) create mode 100644 bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/ordered.xml rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow.xml => usual_cash_transfer_workflow.xml} (95%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/scripts.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/scripts/validateVaultBalance.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/states.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/states/cancelled.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/states/confirmed.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/states/delivered.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => usual_cash_transfer_workflow}/states/draft.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/transitions.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/transitions/cancel.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/transitions/cancel_action.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => usual_cash_transfer_workflow}/transitions/confirm.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/transitions/confirm_action.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/transitions/deliver.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/transitions/deliver_action.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/transitions/reject.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/transitions/reject_action.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/variables.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/variables/action.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/variables/actor.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/variables/comment.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/variables/error_message.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/variables/history.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_classification_workflow => usual_cash_transfer_workflow}/variables/portal_type.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/variables/time.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/worklists.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/worklists/confirmed.xml (100%) rename bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/{cash_transfer_workflow => usual_cash_transfer_workflow}/worklists/draft.xml (100%) rename bt5/{erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/reject.xml => erp5_banking_core/CategoryTemplateItem/portal_categories/aggregate.xml} (53%) create mode 100644 bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getRemainingOperationList.xml create mode 100644 bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getVaultSite.xml diff --git a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Transfer%20Module.xml b/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Sorting%20Module.xml similarity index 97% rename from bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Transfer%20Module.xml rename to bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Sorting%20Module.xml index d67c271025..22374757ef 100644 --- a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Transfer%20Module.xml +++ b/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Sorting%20Module.xml @@ -83,7 +83,7 @@ be a problem).</string> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>Cash Transfer Module</string> </value> + <value> <string>Cash Sorting Module</string> </value> </item> <item> <key> <string>init_script</string> </key> diff --git a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Classification.xml b/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Sorting.xml similarity index 88% rename from bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Classification.xml rename to bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Sorting.xml index eaf68cf959..a273f6f596 100644 --- a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Classification.xml +++ b/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Sorting.xml @@ -36,6 +36,12 @@ <none/> </value> </item> + <item> + <key> <string>_property_domain_dict</string> </key> + <value> + <dictionary/> + </value> + </item> <item> <key> <string>_roles</string> </key> <value> @@ -64,11 +70,11 @@ </item> <item> <key> <string>content_meta_type</string> </key> - <value> <string>BAOBAB Cash Delivery</string> </value> + <value> <string>ERP5Banking Cash Delivery</string> </value> </item> <item> <key> <string>description</string> </key> - <value> <string>An order...</string> </value> + <value> <string>This document represent the result from a sort of cash</string> </value> </item> <item> <key> <string>factory</string> </key> @@ -94,7 +100,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>Cash Classification</string> </value> + <value> <string>Cash Sorting</string> </value> </item> <item> <key> <string>init_script</string> </key> diff --git a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Incoming%20Cash%20Classification%20Line.xml b/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Incoming%20Cash%20Sorting%20Line.xml similarity index 94% rename from bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Incoming%20Cash%20Classification%20Line.xml rename to bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Incoming%20Cash%20Sorting%20Line.xml index f445397164..7bd5132e1e 100644 --- a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Incoming%20Cash%20Classification%20Line.xml +++ b/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Incoming%20Cash%20Sorting%20Line.xml @@ -68,7 +68,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string>Une ligne tarifaire.</string> </value> + <value> <string>This line represent a supply of cash which have to be sort</string> </value> </item> <item> <key> <string>factory</string> </key> @@ -94,7 +94,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>Incoming Cash Classification Line</string> </value> + <value> <string>Incoming Cash Sorting Line</string> </value> </item> <item> <key> <string>init_script</string> </key> diff --git a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Cell.xml b/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Cell.xml new file mode 100644 index 0000000000..609a5a4538 --- /dev/null +++ b/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Cell.xml @@ -0,0 +1,117 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Type.ERP5Type</string> + <string>ERP5TypeInformation</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_actions</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>_aliases</string> </key> + <value> + <dictionary/> + </value> + </item> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_roles</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>acquire_local_roles</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>allowed_content_types</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>base_category_list</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>content_icon</string> </key> + <value> <string>order_line_icon.gif</string> </value> + </item> + <item> + <key> <string>content_meta_type</string> </key> + <value> <string>ERP5Banking Cash Delivery Cell</string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string>Une ligne tarifaire.</string> </value> + </item> + <item> + <key> <string>factory</string> </key> + <value> <string>addCashDeliveryCell</string> </value> + </item> + <item> + <key> <string>filter_content_types</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>group_list</string> </key> + <value> + <tuple> + <string>delivery_movement</string> + <string>order_movement</string> + </tuple> + </value> + </item> + <item> + <key> <string>hidden_content_type_list</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>Outgoing Cash Sorting Cell</string> </value> + </item> + <item> + <key> <string>init_script</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>property_sheet_list</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Outgoing%20Cash%20Classification%20Line.xml b/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Line.xml similarity index 94% rename from bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Outgoing%20Cash%20Classification%20Line.xml rename to bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Line.xml index f834bb274d..e6f44bb99d 100644 --- a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Outgoing%20Cash%20Classification%20Line.xml +++ b/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Outgoing%20Cash%20Sorting%20Line.xml @@ -68,7 +68,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string>Une ligne tarifaire.</string> </value> + <value> <string>Thie represent a result line from a sort of cash</string> </value> </item> <item> <key> <string>factory</string> </key> @@ -94,7 +94,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>Outgoing Cash Classification Line</string> </value> + <value> <string>Outgoing Cash Sorting Line</string> </value> </item> <item> <key> <string>init_script</string> </key> diff --git a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Classification%20Module.xml b/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Usual%20Cash%20Transfer%20Module.xml similarity index 91% rename from bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Classification%20Module.xml rename to bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Usual%20Cash%20Transfer%20Module.xml index fb970cf513..812756b4c3 100644 --- a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Classification%20Module.xml +++ b/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Usual%20Cash%20Transfer%20Module.xml @@ -36,18 +36,16 @@ <none/> </value> </item> - <item> - <key> <string>_property_domain_dict</string> </key> - <value> - <dictionary/> - </value> - </item> <item> <key> <string>_roles</string> </key> <value> <list/> </value> </item> + <item> + <key> <string>acquire_local_roles</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>allowed_content_types</string> </key> <value> @@ -81,6 +79,12 @@ be a problem).</string> </value> <key> <string>filter_content_types</string> </key> <value> <int>1</int> </value> </item> + <item> + <key> <string>group_list</string> </key> + <value> + <tuple/> + </value> + </item> <item> <key> <string>hidden_content_type_list</string> </key> <value> @@ -89,7 +93,7 @@ be a problem).</string> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>Cash Classification Module</string> </value> + <value> <string>Usual Cash Transfer Module</string> </value> </item> <item> <key> <string>init_script</string> </key> diff --git a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Transfer.xml b/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Usual%20Cash%20Transfer.xml similarity index 92% rename from bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Transfer.xml rename to bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Usual%20Cash%20Transfer.xml index fbfaa3dc46..7ee2775275 100644 --- a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Cash%20Transfer.xml +++ b/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Usual%20Cash%20Transfer.xml @@ -68,7 +68,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string>Mouvement intercaisse : ce module permet de transf\xe9rer des fonds entre deux caisses. Il n\xe9cessite toujours deux utilisateurs : l\'un initie et l\'autre valide.</string> </value> + <value> <string>A Usual Cash Transfer represent a transfer of banknotes or coin between the usual cash and a counter</string> </value> </item> <item> <key> <string>factory</string> </key> @@ -94,7 +94,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>Cash Transfer</string> </value> + <value> <string>Usual Cash Transfer</string> </value> </item> <item> <key> <string>init_script</string> </key> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/reject_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/reject_action.xml deleted file mode 100644 index a8f40f2771..0000000000 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/reject_action.xml +++ /dev/null @@ -1,100 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Transitions</string> - <string>TransitionDefinition</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>workflow</string> </value> - </item> - <item> - <key> <string>actbox_name</string> </key> - <value> <string>Return into Error</string> </value> - </item> - <item> - <key> <string>actbox_url</string> </key> - <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=reject_action</string> </value> - </item> - <item> - <key> <string>after_script_name</string> </key> - <value> <string>reject</string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string>Cash Classification is rejected when controller considers that input information is not consistent</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>reject_action</string> </value> - </item> - <item> - <key> <string>new_state_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>script_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Reject Action</string> </value> - </item> - <item> - <key> <string>trigger_type</string> </key> - <value> <int>1</int> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>roles</string> </key> - <value> - <tuple> - <string>Manager</string> - <string>Assignee</string> - </tuple> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/worklists/rejected.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/worklists/rejected.xml deleted file mode 100644 index 3c9cbcfacc..0000000000 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/worklists/rejected.xml +++ /dev/null @@ -1,136 +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>Invalid Cash Classifications (%(count)s)</string> </value> - </item> - <item> - <key> <string>actbox_url</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -Base_viewSearchResultList?simulation_state=draft&portal_type=Cash Classification&simulation_assigned=1&reset=1 - -]]></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string>Invalid Cash Classification</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>rejected</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> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>roles</string> </key> - <value> - <tuple> - <string>Manager</string> - <string>Assignor</string> - </tuple> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> - <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>portal_type</string> </key> - <value> - <tuple> - <string>Cash Classification</string> - </tuple> - </value> - </item> - <item> - <key> <string>simulation_assigned</string> </key> - <value> - <tuple> - <string>1</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_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow.xml similarity index 91% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow.xml index 04c738116d..5b0ad8f9a3 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow.xml @@ -38,7 +38,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>cash_classification_workflow</string> </value> + <value> <string>cash_sorting_workflow</string> </value> </item> <item> <key> <string>initial_state</string> </key> @@ -60,7 +60,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Cash Classification Workflow</string> </value> + <value> <string>Cash Sorting Workflow</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/scripts.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/scripts.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/scripts.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/scripts.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/scripts/validateBalance.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/scripts/validateBalance.xml similarity index 77% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/scripts/validateBalance.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/scripts/validateBalance.xml index 7510dc3b58..5dfd023bf9 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/scripts/validateBalance.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/scripts/validateBalance.xml @@ -71,24 +71,23 @@ from Products.ERP5Type.Message import Message\n \n # Purchase Transaction .\n transaction = state_change.object\n -vault = transaction.getSource()\n -\n # Get inventory\n -resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type=[\'Incoming Cash Classification Line\', \'Outgoing Cash Classification Line\'])\n +vault = transaction.getSource()\n +resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type=\'Incoming Cash Sorting Line\')\n \n # Get price and total_price.\n price = transaction.getSourceTotalAssetPrice()\n -site_cash = transaction.getTotalPrice(deliveryLineType=\'Incoming Cash Classification Line\')\n -external_cash = transaction.getTotalPrice(deliveryLineType=\'Outgoing Cash Classification Line\')\n +input_cash = transaction.getTotalPrice(deliveryLineType=\'Incoming Cash Sorting Line\')\n +output_cash = transaction.getTotalPrice(deliveryLineType=\'Outgoing Cash Sorting Line\')\n \n -if price != (site_cash + external_cash):\n - msg = Message(domain="ui", message="Amount is different from cash details.")\n +if input_cash != output_cash :\n + msg=Message(domain="ui", message="Incoming cash amount is different from outgoing cash amount.")\n raise ValidationFailed, (msg,)\n -elif resource == 2:\n - msg = Message(domain="ui", message="No Resource.")\n +elif price != output_cash :\n + msg=Message(domain=\'ui\',message=\'Amount differs from cash total.\')\n raise ValidationFailed, (msg,)\n -elif resource == 1:\n - msg = Message(domain="ui", message="Insufficient Balance.")\n +elif resource != 0 :\n + msg=Message(domain=\'ui\',message=\'Insufficient Balance.\')\n raise ValidationFailed, (msg,)\n </string> </value> </item> @@ -98,15 +97,9 @@ elif resource == 1:\n <none/> </value> </item> - <item> - <key> <string>_dav_writelocks</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> <item> <key> <string>_filepath</string> </key> - <value> <string>Script (Python):/baobab/portal_workflow/cash_classification_workflow/scripts/validateBalance</string> </value> + <value> <string>Script (Python):/BCEAO/portal_workflow/cash_exchange_workflow/scripts/validateBalance</string> </value> </item> <item> <key> <string>_owner</string> </key> @@ -152,8 +145,8 @@ elif resource == 1:\n <string>vault</string> <string>resource</string> <string>price</string> - <string>site_cash</string> - <string>external_cash</string> + <string>input_cash</string> + <string>output_cash</string> <string>msg</string> </tuple> </value> @@ -182,25 +175,4 @@ elif resource == 1:\n </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/> - </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/states.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/states.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/states/cancelled.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/cancelled.xml similarity index 88% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/states/cancelled.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/cancelled.xml index e90e809229..c2a35aceba 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/states/cancelled.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/cancelled.xml @@ -71,27 +71,29 @@ <key> <string>Access contents information</string> </key> <value> <tuple> - <string>Assignee</string> <string>Assignor</string> + <string>DestinationAssignee</string> + <string>DestinationAssignor</string> <string>Manager</string> - <string>Owner</string> </tuple> </value> </item> <item> <key> <string>Modify portal content</string> </key> <value> - <tuple/> + <tuple> + <string>Manager</string> + </tuple> </value> </item> <item> <key> <string>View</string> </key> <value> <tuple> - <string>Assignee</string> <string>Assignor</string> + <string>DestinationAssignee</string> + <string>DestinationAssignor</string> <string>Manager</string> - <string>Owner</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/states/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/confirmed.xml similarity index 84% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/states/confirmed.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/confirmed.xml index f8fe01a9ef..73257ee676 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/states/confirmed.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/confirmed.xml @@ -40,19 +40,25 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Confirmed</string> </value> + <value> <string>Waiting for validation</string> </value> </item> <item> <key> <string>transitions</string> </key> <value> <tuple> + <string>cancel</string> + <string>cancel_action</string> <string>deliver</string> <string>deliver_action</string> - <string>reject</string> - <string>reject_action</string> </tuple> </value> </item> + <item> + <key> <string>type_list</string> </key> + <value> + <tuple/> + </value> + </item> </dictionary> </pickle> </record> @@ -76,10 +82,10 @@ <key> <string>Access contents information</string> </key> <value> <tuple> - <string>Assignee</string> <string>Assignor</string> + <string>DestinationAssignee</string> + <string>DestinationAssignor</string> <string>Manager</string> - <string>Owner</string> </tuple> </value> </item> @@ -87,7 +93,6 @@ <key> <string>Modify portal content</string> </key> <value> <tuple> - <string>Assignee</string> <string>Manager</string> </tuple> </value> @@ -96,10 +101,10 @@ <key> <string>View</string> </key> <value> <tuple> - <string>Assignee</string> <string>Assignor</string> + <string>DestinationAssignee</string> + <string>DestinationAssignor</string> <string>Manager</string> - <string>Owner</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/delivered.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/delivered.xml new file mode 100644 index 0000000000..f7e6a515cf --- /dev/null +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/delivered.xml @@ -0,0 +1,115 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.States</string> + <string>StateDefinition</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>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>delivered</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>Delivered</string> </value> + </item> + <item> + <key> <string>transitions</string> </key> + <value> + <tuple> + <string>cancel</string> + <string>cancel_action</string> + </tuple> + </value> + </item> + <item> + <key> <string>type_list</string> </key> + <value> + <tuple/> + </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>Access contents information</string> </key> + <value> + <tuple> + <string>Assignor</string> + <string>DestinationAssignee</string> + <string>DestinationAssignor</string> + <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>Assignor</string> + <string>DestinationAssignee</string> + <string>DestinationAssignor</string> + <string>Manager</string> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/states/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/draft.xml similarity index 88% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/states/draft.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/draft.xml index 260b707b07..74478b1459 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/states/draft.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/draft.xml @@ -26,7 +26,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>Documents in draft state should never be accounted and should only be visible by their ownner</string> </value> </item> <item> <key> <string>id</string> </key> @@ -48,11 +48,17 @@ <tuple> <string>cancel</string> <string>cancel_action</string> - <string>confirm</string> - <string>confirm_action</string> + <string>order</string> + <string>order_action</string> </tuple> </value> </item> + <item> + <key> <string>type_list</string> </key> + <value> + <tuple/> + </value> + </item> </dictionary> </pickle> </record> @@ -76,10 +82,8 @@ <key> <string>Access contents information</string> </key> <value> <tuple> - <string>Assignee</string> <string>Assignor</string> <string>Manager</string> - <string>Owner</string> </tuple> </value> </item> @@ -89,7 +93,6 @@ <tuple> <string>Assignor</string> <string>Manager</string> - <string>Owner</string> </tuple> </value> </item> @@ -97,10 +100,8 @@ <key> <string>View</string> </key> <value> <tuple> - <string>Assignee</string> <string>Assignor</string> <string>Manager</string> - <string>Owner</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/states/delivered.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/ordered.xml similarity index 82% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/states/delivered.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/ordered.xml index da659bdc9a..e064268e56 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/states/delivered.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/states/ordered.xml @@ -30,7 +30,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>delivered</string> </value> + <value> <string>ordered</string> </value> </item> <item> <key> <string>permission_roles</string> </key> @@ -40,10 +40,21 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Delivered</string> </value> + <value> <string>Sent to vault</string> </value> </item> <item> <key> <string>transitions</string> </key> + <value> + <tuple> + <string>cancel</string> + <string>cancel_action</string> + <string>confirm</string> + <string>confirm_action</string> + </tuple> + </value> + </item> + <item> + <key> <string>type_list</string> </key> <value> <tuple/> </value> @@ -71,10 +82,9 @@ <key> <string>Access contents information</string> </key> <value> <tuple> - <string>Assignee</string> <string>Assignor</string> + <string>DestinationAssignor</string> <string>Manager</string> - <string>Owner</string> </tuple> </value> </item> @@ -88,10 +98,9 @@ <key> <string>View</string> </key> <value> <tuple> - <string>Assignee</string> <string>Assignor</string> + <string>DestinationAssignor</string> <string>Manager</string> - <string>Owner</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/cancel.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/cancel.xml similarity index 96% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/cancel.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/cancel.xml index 7855ac335d..f6869fbf27 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/cancel.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/cancel.xml @@ -91,7 +91,8 @@ <tuple> <string>Manager</string> <string>Assignor</string> - <string>Owner</string> + <string>DestinationAssignee</string> + <string>DestinationAssignor</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/cancel_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/cancel_action.xml similarity index 96% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/cancel_action.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/cancel_action.xml index e7737ccfa2..dd56b2fb19 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/cancel_action.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/cancel_action.xml @@ -91,7 +91,8 @@ <tuple> <string>Manager</string> <string>Assignor</string> - <string>Owner</string> + <string>DestinationAssignee</string> + <string>DestinationAssignor</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/transitions/confirm.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/confirm.xml similarity index 97% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/transitions/confirm.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/confirm.xml index eca2a408cf..3459579a64 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/transitions/confirm.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/confirm.xml @@ -89,9 +89,8 @@ <key> <string>roles</string> </key> <value> <tuple> - <string>Assignor</string> <string>Manager</string> - <string>Owner</string> + <string>DestinationAssignor</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/confirm_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/confirm_action.xml similarity index 93% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/confirm_action.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/confirm_action.xml index fe0dd28244..2cbea09e0c 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/confirm_action.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/confirm_action.xml @@ -60,11 +60,11 @@ </item> <item> <key> <string>script_name</string> </key> - <value> <string>validateBalance</string> </value> + <value> <string></string> </value> </item> <item> <key> <string>title</string> </key> - <value> <string>Confirm Action</string> </value> + <value> <string>Send To Validation</string> </value> </item> <item> <key> <string>trigger_type</string> </key> @@ -89,9 +89,8 @@ <key> <string>roles</string> </key> <value> <tuple> - <string>Assignor</string> <string>Manager</string> - <string>Owner</string> + <string>DestinationAssignor</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/deliver.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/deliver.xml similarity index 98% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/deliver.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/deliver.xml index b498791a17..1af33ab1af 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/deliver.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/deliver.xml @@ -90,7 +90,7 @@ <value> <tuple> <string>Manager</string> - <string>Assignee</string> + <string>DestinationAssignee</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/deliver_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/deliver_action.xml similarity index 94% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/deliver_action.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/deliver_action.xml index a8a40251a6..e54aa4793f 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/deliver_action.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/deliver_action.xml @@ -30,7 +30,7 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Deliver</string> </value> + <value> <string>Validate</string> </value> </item> <item> <key> <string>actbox_url</string> </key> @@ -64,7 +64,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Deliver Action</string> </value> + <value> <string>Validate</string> </value> </item> <item> <key> <string>trigger_type</string> </key> @@ -90,7 +90,7 @@ <value> <tuple> <string>Manager</string> - <string>Assignee</string> + <string>DestinationAssignee</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/order.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/order.xml new file mode 100644 index 0000000000..5ecb808987 --- /dev/null +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/order.xml @@ -0,0 +1,100 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.Transitions</string> + <string>TransitionDefinition</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>workflow</string> </value> + </item> + <item> + <key> <string>actbox_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>after_script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></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>order</string> </value> + </item> + <item> + <key> <string>new_state_id</string> </key> + <value> <string>ordered</string> </value> + </item> + <item> + <key> <string>script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Order</string> </value> + </item> + <item> + <key> <string>trigger_type</string> </key> + <value> <int>2</int> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.Guard</string> + <string>Guard</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>roles</string> </key> + <value> + <tuple> + <string>Manager</string> + <string>Assignor</string> + </tuple> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/order_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/order_action.xml new file mode 100644 index 0000000000..da2b2afd4a --- /dev/null +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/transitions/order_action.xml @@ -0,0 +1,100 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.Transitions</string> + <string>TransitionDefinition</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>workflow</string> </value> + </item> + <item> + <key> <string>actbox_name</string> </key> + <value> <string>Send To Vault</string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=order_action</string> </value> + </item> + <item> + <key> <string>after_script_name</string> </key> + <value> <string>order</string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></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>order_action</string> </value> + </item> + <item> + <key> <string>new_state_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>script_name</string> </key> + <value> <string>validateBalance</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Send To Vault</string> </value> + </item> + <item> + <key> <string>trigger_type</string> </key> + <value> <int>1</int> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.Guard</string> + <string>Guard</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>roles</string> </key> + <value> + <tuple> + <string>Manager</string> + <string>Assignor</string> + </tuple> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables/action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/action.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables/action.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/action.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables/actor.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/actor.xml similarity index 97% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables/actor.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/actor.xml index 9315f72ee6..bf23d008cc 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables/actor.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/actor.xml @@ -36,7 +36,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>Auteur</string> </value> </item> <item> <key> <string>for_catalog</string> </key> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables/comment.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/comment.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables/comment.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/comment.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables/error_message.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/error_message.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables/error_message.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/error_message.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables/history.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/history.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables/history.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/history.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/portal_type.xml similarity index 96% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/variables/portal_type.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/portal_type.xml index 2ecf5517bd..f9bdd17fb0 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/variables/portal_type.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/portal_type.xml @@ -32,7 +32,7 @@ </item> <item> <key> <string>default_value</string> </key> - <value> <string></string> </value> + <value> <string>Cash Sorting</string> </value> </item> <item> <key> <string>description</string> </key> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables/simulation_assigned.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/simulation_assigned.xml similarity index 97% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables/simulation_assigned.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/simulation_assigned.xml index 4f3733f166..25c03a75bf 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables/simulation_assigned.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/simulation_assigned.xml @@ -32,7 +32,7 @@ </item> <item> <key> <string>default_value</string> </key> - <value> <string>0</string> </value> + <value> <string></string> </value> </item> <item> <key> <string>description</string> </key> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables/time.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/time.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables/time.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/time.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/worklists.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/worklists.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/confirmed.xml similarity index 89% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/worklists/confirmed.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/confirmed.xml index 3f36329344..be6a24e549 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/worklists/confirmed.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/confirmed.xml @@ -30,19 +30,19 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Cash Classifications to Validate (%(count)s)</string> </value> + <value> <string>Cash Sorting To Validate (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -Base_viewSearchResultList?simulation_state=confirmed&portal_type=Cash Classification&reset=1 +Base_viewSearchResultList?cash_sorting_state=confimed&portal_type=Cash Sorting&reset=1 ]]></string> </value> </item> <item> <key> <string>description</string> </key> - <value> <string>Cash Classifications to Validate</string> </value> + <value> <string>Cash Sorting To Validate</string> </value> </item> <item> <key> <string>guard</string> </key> @@ -80,7 +80,7 @@ Base_viewSearchResultList?simulation_state=confirmed&portal_type=Cash Classifica <value> <tuple> <string>Manager</string> - <string>Assignee</string> + <string>DestinationAssignee</string> </tuple> </value> </item> @@ -107,7 +107,7 @@ Base_viewSearchResultList?simulation_state=confirmed&portal_type=Cash Classifica <key> <string>portal_type</string> </key> <value> <tuple> - <string>Cash Classification</string> + <string>Cash Sorting</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/draft.xml similarity index 91% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/worklists/draft.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/draft.xml index a434779b58..a03a8b998f 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/worklists/draft.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/draft.xml @@ -30,19 +30,19 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Drafts to Validate (%(count)s)</string> </value> + <value> <string>Draft To Validate (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -Base_viewSearchResultList?simulation_state=draft&portal_type=Cash Classification&reset=1 +Base_viewSearchResultList?cash_sorting_state=draft&portal_type=Cash Sorting&reset=1 ]]></string> </value> </item> <item> <key> <string>description</string> </key> - <value> <string>Drafts to Validate</string> </value> + <value> <string>Draft to validate</string> </value> </item> <item> <key> <string>guard</string> </key> @@ -107,7 +107,7 @@ Base_viewSearchResultList?simulation_state=draft&portal_type=Cash Classification <key> <string>portal_type</string> </key> <value> <tuple> - <string>Cash Classification</string> + <string>Cash Sorting</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/ordered.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/ordered.xml new file mode 100644 index 0000000000..c69dbf9e20 --- /dev/null +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/worklists/ordered.xml @@ -0,0 +1,128 @@ +<?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>Cash Sorting To Validate (%(count)s)</string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +Base_viewSearchResultList?cash_sorting_state=ordered&portal_type=Cash Sorting&reset=1 + +]]></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string>Cash Sorting 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>ordered</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> + <tuple> + <string>Products.DCWorkflow.Guard</string> + <string>Guard</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>roles</string> </key> + <value> + <tuple> + <string>Manager</string> + <string>DestinationAssignor</string> + </tuple> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <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>portal_type</string> </key> + <value> + <tuple> + <string>Cash Sorting</string> + </tuple> + </value> + </item> + <item> + <key> <string>simulation_state</string> </key> + <value> + <tuple> + <string>ordered</string> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow.xml similarity index 95% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow.xml index 66a88d5771..965b8ceabf 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow.xml +++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow.xml @@ -38,7 +38,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>cash_transfer_workflow</string> </value> + <value> <string>usual_cash_transfer_workflow</string> </value> </item> <item> <key> <string>initial_state</string> </key> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/scripts.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/scripts.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/scripts.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/scripts.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/scripts/validateVaultBalance.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/scripts/validateVaultBalance.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/scripts/validateVaultBalance.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/scripts/validateVaultBalance.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/states.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/states.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/states.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/states.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/states/cancelled.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/states/cancelled.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/states/cancelled.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/states/cancelled.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/states/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/states/confirmed.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/states/confirmed.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/states/confirmed.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/states/delivered.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/states/delivered.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/states/delivered.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/states/delivered.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/states/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/states/draft.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/states/draft.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/states/draft.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/transitions.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/transitions.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/transitions.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/transitions.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/transitions/cancel.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/transitions/cancel.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/transitions/cancel.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/transitions/cancel.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/transitions/cancel_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/transitions/cancel_action.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/transitions/cancel_action.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/transitions/cancel_action.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/confirm.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/transitions/confirm.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/confirm.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/transitions/confirm.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/transitions/confirm_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/transitions/confirm_action.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/transitions/confirm_action.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/transitions/confirm_action.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/transitions/deliver.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/transitions/deliver.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/transitions/deliver.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/transitions/deliver.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/transitions/deliver_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/transitions/deliver_action.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/transitions/deliver_action.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/transitions/deliver_action.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/transitions/reject.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/transitions/reject.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/transitions/reject.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/transitions/reject.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/transitions/reject_action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/transitions/reject_action.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/transitions/reject_action.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/transitions/reject_action.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/variables.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/variables.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/variables/action.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables/action.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/variables/action.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables/action.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/variables/actor.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables/actor.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/variables/actor.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables/actor.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/variables/comment.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables/comment.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/variables/comment.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables/comment.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/variables/error_message.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables/error_message.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/variables/error_message.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables/error_message.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/variables/history.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables/history.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/variables/history.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables/history.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables/portal_type.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables/portal_type.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/variables/portal_type.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables/portal_type.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/variables/time.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables/time.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/variables/time.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables/time.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/worklists.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/worklists.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/worklists.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/worklists.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/worklists/confirmed.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/worklists/confirmed.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/worklists/confirmed.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/worklists/confirmed.xml diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/worklists/draft.xml b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/worklists/draft.xml similarity index 100% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_transfer_workflow/worklists/draft.xml rename to bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/worklists/draft.xml diff --git a/bt5/erp5_banking_cash/bt/change_log b/bt5/erp5_banking_cash/bt/change_log index 1312d496b5..6c7137ff8a 100644 --- a/bt5/erp5_banking_cash/bt/change_log +++ b/bt5/erp5_banking_cash/bt/change_log @@ -1,3 +1,9 @@ +2006-04-26 aurel +* add outgoing cash sorting cell + +2006-04-24 aurel +* use cash sorting instead of cash classification + 2006-04-06 aurel * remove accounting event for cash classification diff --git a/bt5/erp5_banking_cash/bt/template_action_path_list b/bt5/erp5_banking_cash/bt/template_action_path_list index ccfe191cbe..12adcf0f14 100644 --- a/bt5/erp5_banking_cash/bt/template_action_path_list +++ b/bt5/erp5_banking_cash/bt/template_action_path_list @@ -1,28 +1,25 @@ -Cash Classification Module | list_ui -Cash Classification Module | sort_on -Cash Classification Module | view -Cash Classification | external -Cash Classification | fastinputIn -Cash Classification | fastinputOut -Cash Classification | history -Cash Classification | list -Cash Classification | metadata -Cash Classification | print -Cash Classification | source -Cash Classification | view -Cash Transfer Module | list_ui -Cash Transfer Module | sort_on -Cash Transfer Module | view -Cash Transfer | fastinput -Cash Transfer | history -Cash Transfer | metadata -Cash Transfer | print -Cash Transfer | view -Incoming Cash Classification Line | list -Incoming Cash Classification Line | metadata -Incoming Cash Classification Line | print -Incoming Cash Classification Line | view -Outgoing Cash Classification Line | list -Outgoing Cash Classification Line | metadata -Outgoing Cash Classification Line | print -Outgoing Cash Classification Line | view \ No newline at end of file +Cash Sorting Module | list +Cash Sorting Module | list_ui +Cash Sorting Module | sort_on +Cash Sorting Module | view +Cash Sorting | history +Cash Sorting | incoming_fastinput +Cash Sorting | incoming_line_view +Cash Sorting | metadata +Cash Sorting | outgoing_fastinput +Cash Sorting | outgoing_line_list +Cash Sorting | view +Incoming Cash Sorting Line | metadata +Incoming Cash Sorting Line | view +Outgoing Cash Sorting Cell | metadata +Outgoing Cash Sorting Cell | view +Outgoing Cash Sorting Line | metadata +Outgoing Cash Sorting Line | view +Usual Cash Transfer Module | list_ui +Usual Cash Transfer Module | sort_on +Usual Cash Transfer Module | view +Usual Cash Transfer | fastinput +Usual Cash Transfer | history +Usual Cash Transfer | metadata +Usual Cash Transfer | print +Usual Cash Transfer | view \ No newline at end of file diff --git a/bt5/erp5_banking_cash/bt/template_module_id_list b/bt5/erp5_banking_cash/bt/template_module_id_list index 732c798878..ab8a6f11c5 100644 --- a/bt5/erp5_banking_cash/bt/template_module_id_list +++ b/bt5/erp5_banking_cash/bt/template_module_id_list @@ -1,2 +1,2 @@ -cash_classification_module -cash_transfer_module \ No newline at end of file +cash_sorting_module +usual_cash_transfer_module \ No newline at end of file diff --git a/bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list index 80d53c1a3e..bc3b55b2a8 100644 --- a/bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list +++ b/bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list @@ -1,7 +1,7 @@ -Cash Classification Module | Cash Classification -Cash Classification | Incoming Cash Classification Line -Cash Classification | Outgoing Cash Classification Line -Cash Transfer Module | Cash Transfer -Cash Transfer | Cash Delivery Line -Incoming Cash Classification Line | Cash Delivery Cell -Outgoing Cash Classification Line | Cash Delivery Cell \ No newline at end of file +Cash Sorting Module | Cash Sorting +Cash Sorting | Incoming Cash Sorting Line +Cash Sorting | Outgoing Cash Sorting Line +Incoming Cash Sorting Line | Cash Delivery Cell +Outgoing Cash Sorting Line | Outgoing Cash Sorting Cell +Usual Cash Transfer Module | Usual Cash Transfer +Usual Cash Transfer | Cash Delivery Line \ No newline at end of file diff --git a/bt5/erp5_banking_cash/bt/template_portal_type_base_category_list b/bt5/erp5_banking_cash/bt/template_portal_type_base_category_list index e69de29bb2..dbed57f812 100644 --- a/bt5/erp5_banking_cash/bt/template_portal_type_base_category_list +++ b/bt5/erp5_banking_cash/bt/template_portal_type_base_category_list @@ -0,0 +1 @@ +Outgoing Cash Sorting Cell | variation \ No newline at end of file diff --git a/bt5/erp5_banking_cash/bt/template_portal_type_hidden_content_type_list b/bt5/erp5_banking_cash/bt/template_portal_type_hidden_content_type_list index ac928c84cd..0168ba856e 100644 --- a/bt5/erp5_banking_cash/bt/template_portal_type_hidden_content_type_list +++ b/bt5/erp5_banking_cash/bt/template_portal_type_hidden_content_type_list @@ -1,5 +1,5 @@ -Cash Classification | Incoming Cash Classification Line -Cash Classification | Outgoing Cash Classification Line -Cash Transfer | Cash Delivery Line -Incoming Cash Classification Line | Cash Delivery Cell -Outgoing Cash Classification Line | Cash Delivery Cell \ No newline at end of file +Cash Sorting | Incoming Cash Sorting Line +Cash Sorting | Outgoing Cash Sorting Line +Incoming Cash Sorting Line | Cash Delivery Cell +Outgoing Cash Sorting Line | Outgoing Cash Sorting Cell +Usual Cash Transfer | Cash Delivery Line \ No newline at end of file diff --git a/bt5/erp5_banking_cash/bt/template_portal_type_id_list b/bt5/erp5_banking_cash/bt/template_portal_type_id_list index e73e554587..d1c9f54566 100644 --- a/bt5/erp5_banking_cash/bt/template_portal_type_id_list +++ b/bt5/erp5_banking_cash/bt/template_portal_type_id_list @@ -1,6 +1,7 @@ -Cash Classification -Cash Classification Module -Cash Transfer -Cash Transfer Module -Incoming Cash Classification Line -Outgoing Cash Classification Line \ No newline at end of file +Cash Sorting +Cash Sorting Module +Incoming Cash Sorting Line +Outgoing Cash Sorting Cell +Outgoing Cash Sorting Line +Usual Cash Transfer +Usual Cash Transfer Module \ No newline at end of file diff --git a/bt5/erp5_banking_cash/bt/template_portal_type_property_sheet_list b/bt5/erp5_banking_cash/bt/template_portal_type_property_sheet_list index 141a0151c5..53ae04e7fd 100644 --- a/bt5/erp5_banking_cash/bt/template_portal_type_property_sheet_list +++ b/bt5/erp5_banking_cash/bt/template_portal_type_property_sheet_list @@ -1,5 +1,6 @@ -Cash Classification | Price -Cash Transfer | Amount -Cash Transfer | Price -Incoming Cash Classification Line | CashDeliveryLine -Outgoing Cash Classification Line | CashDeliveryLine \ No newline at end of file +Cash Sorting | Price +Incoming Cash Sorting Line | CashDeliveryLine +Outgoing Cash Sorting Cell | CashDeliveryLine +Outgoing Cash Sorting Line | CashDeliveryLine +Usual Cash Transfer | Amount +Usual Cash Transfer | Price \ No newline at end of file diff --git a/bt5/erp5_banking_cash/bt/template_portal_type_workflow_chain_list b/bt5/erp5_banking_cash/bt/template_portal_type_workflow_chain_list index d61ca76795..bfe0c1c459 100644 --- a/bt5/erp5_banking_cash/bt/template_portal_type_workflow_chain_list +++ b/bt5/erp5_banking_cash/bt/template_portal_type_workflow_chain_list @@ -1,4 +1,4 @@ -Cash Classification | cash_classification_workflow -Cash Classification | edit_workflow -Cash Transfer | cash_transfer_workflow -Cash Transfer | edit_workflow \ No newline at end of file +Cash Sorting | cash_sorting_workflow +Cash Sorting | edit_workflow +Usual Cash Transfer | edit_workflow +Usual Cash Transfer | usual_cash_transfer_workflow \ No newline at end of file diff --git a/bt5/erp5_banking_cash/bt/template_workflow_id_list b/bt5/erp5_banking_cash/bt/template_workflow_id_list index 6e5881f4f3..405db43b61 100644 --- a/bt5/erp5_banking_cash/bt/template_workflow_id_list +++ b/bt5/erp5_banking_cash/bt/template_workflow_id_list @@ -1,2 +1,2 @@ -cash_classification_workflow -cash_transfer_workflow \ No newline at end of file +cash_sorting_workflow +usual_cash_transfer_workflow \ No newline at end of file diff --git a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/list_ui.xml b/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/list_ui.xml index 319f5c5970..3f6f17206e 100644 --- a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/list_ui.xml +++ b/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/list_ui.xml @@ -44,6 +44,10 @@ <key> <string>id</string> </key> <value> <string>list_ui</string> </value> </item> + <item> + <key> <string>optional</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>permissions</string> </key> <value> diff --git a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/sort_on.xml b/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/sort_on.xml index 844f84b37f..e844fa54d3 100644 --- a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/sort_on.xml +++ b/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/sort_on.xml @@ -44,6 +44,10 @@ <key> <string>id</string> </key> <value> <string>sort_on</string> </value> </item> + <item> + <key> <string>optional</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>permissions</string> </key> <value> diff --git a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_report.xml b/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_report.xml index 43f1dfadf1..c6406205e5 100644 --- a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_report.xml +++ b/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_report.xml @@ -44,6 +44,10 @@ <key> <string>id</string> </key> <value> <string>vault_report</string> </value> </item> + <item> + <key> <string>optional</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>permissions</string> </key> <value> diff --git a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/view.xml b/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/view.xml index 6096305740..289b7c1ee2 100644 --- a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/view.xml +++ b/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/view.xml @@ -44,6 +44,10 @@ <key> <string>id</string> </key> <value> <string>view</string> </value> </item> + <item> + <key> <string>optional</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>permissions</string> </key> <value> diff --git a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/reject.xml b/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/aggregate.xml similarity index 53% rename from bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/reject.xml rename to bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/aggregate.xml index a773779143..3f4e48e5a2 100644 --- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_classification_workflow/transitions/reject.xml +++ b/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/aggregate.xml @@ -4,8 +4,8 @@ <pickle> <tuple> <tuple> - <string>Products.DCWorkflow.Transitions</string> - <string>TransitionDefinition</string> + <string>Products.ERP5Type.Document.BaseCategory</string> + <string>BaseCategory</string> </tuple> <none/> </tuple> @@ -19,61 +19,79 @@ </value> </item> <item> - <key> <string>_owner</string> </key> + <key> <string>_count</string> </key> <value> - <none/> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> - <key> <string>actbox_category</string> </key> - <value> <string>workflow</string> </value> + <key> <string>_mt_index</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> </item> <item> - <key> <string>actbox_name</string> </key> - <value> <string></string> </value> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> </item> <item> - <key> <string>actbox_url</string> </key> - <value> <string></string> </value> + <key> <string>_tree</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> </item> <item> - <key> <string>after_script_name</string> </key> - <value> <string></string> </value> + <key> <string>acquisition_portal_type</string> </key> + <value> <string>python: []</string> </value> </item> <item> - <key> <string>description</string> </key> - <value> <string></string> </value> + <key> <string>categories</string> </key> + <value> + <tuple> + <string>aggregate</string> + </tuple> + </value> </item> <item> - <key> <string>guard</string> </key> + <key> <string>category_type</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + <tuple> + <string>sub_variation</string> + </tuple> </value> </item> <item> - <key> <string>id</string> </key> - <value> <string>reject</string> </value> + <key> <string>description</string> </key> + <value> + <none/> + </value> </item> <item> - <key> <string>new_state_id</string> </key> - <value> <string>draft</string> </value> + <key> <string>id</string> </key> + <value> <string>aggregate</string> </value> </item> <item> - <key> <string>script_name</string> </key> - <value> <string></string> </value> + <key> <string>portal_type</string> </key> + <value> <string>Base Category</string> </value> </item> <item> <key> <string>title</string> </key> - <value> <string>Reject</string> </value> + <value> + <none/> + </value> </item> <item> - <key> <string>trigger_type</string> </key> - <value> <int>2</int> </value> + <key> <string>uid</string> </key> + <value> + <none/> + </value> </item> <item> - <key> <string>var_exprs</string> </key> + <key> <string>workflow_history</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent> </value> </item> </dictionary> @@ -83,60 +101,48 @@ <pickle> <tuple> <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> + <string>BTrees.Length</string> + <string>Length</string> </tuple> <none/> </tuple> </pickle> - <pickle> - <dictionary> - <item> - <key> <string>roles</string> </key> - <value> - <tuple> - <string>Manager</string> - <string>Assignee</string> - </tuple> - </value> - </item> - </dictionary> - </pickle> + <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> </tuple> <none/> </tuple> </pickle> <pickle> - <dictionary> - <item> - <key> <string>_container</string> </key> - <value> - <dictionary> - <item> - <key> <string>simulation_assigned</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> - </value> - </item> - </dictionary> - </value> - </item> - </dictionary> + <none/> </pickle> </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> <tuple> <tuple> - <string>Products.CMFCore.Expression</string> - <string>Expression</string> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <none/> + </pickle> + </record> + <record id="5" aka="AAAAAAAAAAU="> + <pickle> + <tuple> + <tuple> + <string>Persistence</string> + <string>PersistentMapping</string> </tuple> <none/> </tuple> @@ -144,8 +150,10 @@ <pickle> <dictionary> <item> - <key> <string>text</string> </key> - <value> <string>python:1</string> </value> + <key> <string>_container</string> </key> + <value> + <dictionary/> + </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/vault_type.xml b/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/vault_type.xml index 1998b8605e..3f00643af7 100644 --- a/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/vault_type.xml +++ b/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/vault_type.xml @@ -42,24 +42,6 @@ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> </value> </item> - <item> - <key> <string>acquisition_base_category</string> </key> - <value> - <tuple> - <string>parent</string> - </tuple> - </value> - </item> - <item> - <key> <string>acquisition_portal_type</string> </key> - <value> <string>python: [\'Category\', \'Base Category\']</string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>vault_type</string> </value> diff --git a/bt5/erp5_banking_core/ModuleTemplateItem/account_module.xml b/bt5/erp5_banking_core/ModuleTemplateItem/account_module.xml index 188e1da0f5..38b37e26ad 100644 --- a/bt5/erp5_banking_core/ModuleTemplateItem/account_module.xml +++ b/bt5/erp5_banking_core/ModuleTemplateItem/account_module.xml @@ -172,6 +172,9 @@ <name>Add ERP5Form Tools</name> <role>Manager</role> </permission> + <permission> + <name>Add ERP5Subversion Tools</name> + </permission> <permission> <name>Add ERP5SyncML Tools</name> <role>Manager</role> @@ -244,10 +247,6 @@ <name>Add Plugin Registrys</name> <role>Manager</role> </permission> - <permission> - <name>Add Portal ZSyncer Tools</name> - <role>Manager</role> - </permission> <permission> <name>Add Python Scripts</name> <role>Manager</role> @@ -316,10 +315,6 @@ <name>Add ZODB Mount Points</name> <role>Manager</role> </permission> - <permission> - <name>Add ZSyncers</name> - <role>Manager</role> - </permission> <permission> <name>Add Zope Tutorials</name> <role>Manager</role> @@ -542,10 +537,6 @@ <name>Manage Transient Object Container</name> <role>Manager</role> </permission> - <permission> - <name>Manage Translation Services</name> - <role>Manager</role> - </permission> <permission> <name>Manage Vocabulary</name> <role>Manager</role> @@ -713,10 +704,6 @@ <name>WebDAV access</name> <role>Manager</role> </permission> - <permission> - <name>ZSyncer: Use ZSyncer</name> - <role>Manager</role> - </permission> <permission> <name>ZopeProfiler: manage</name> <role>Manager</role> diff --git a/bt5/erp5_banking_core/ModuleTemplateItem/checkbook_module.xml b/bt5/erp5_banking_core/ModuleTemplateItem/checkbook_module.xml index 87c3537fc2..5ea1ff201e 100644 --- a/bt5/erp5_banking_core/ModuleTemplateItem/checkbook_module.xml +++ b/bt5/erp5_banking_core/ModuleTemplateItem/checkbook_module.xml @@ -166,6 +166,9 @@ <name>Add ERP5Form Tools</name> <role>Manager</role> </permission> + <permission> + <name>Add ERP5Subversion Tools</name> + </permission> <permission> <name>Add ERP5SyncML Tools</name> <role>Manager</role> @@ -237,9 +240,6 @@ <permission> <name>Add Plugin Registrys</name> </permission> - <permission> - <name>Add Portal ZSyncer Tools</name> - </permission> <permission> <name>Add Python Scripts</name> <role>Manager</role> @@ -308,9 +308,6 @@ <name>Add ZODB Mount Points</name> <role>Manager</role> </permission> - <permission> - <name>Add ZSyncers</name> - </permission> <permission> <name>Add Zope Tutorials</name> <role>Manager</role> @@ -531,10 +528,6 @@ <name>Manage Transient Object Container</name> <role>Manager</role> </permission> - <permission> - <name>Manage Translation Services</name> - <role>Manager</role> - </permission> <permission> <name>Manage Vocabulary</name> <role>Manager</role> @@ -701,9 +694,6 @@ <name>WebDAV access</name> <role>Manager</role> </permission> - <permission> - <name>ZSyncer: Use ZSyncer</name> - </permission> <permission> <name>ZopeProfiler: manage</name> <role>Manager</role> diff --git a/bt5/erp5_banking_core/ModuleTemplateItem/counter_date_module.xml b/bt5/erp5_banking_core/ModuleTemplateItem/counter_date_module.xml index 432a7384fb..0e7795c575 100644 --- a/bt5/erp5_banking_core/ModuleTemplateItem/counter_date_module.xml +++ b/bt5/erp5_banking_core/ModuleTemplateItem/counter_date_module.xml @@ -173,6 +173,9 @@ <name>Add ERP5Form Tools</name> <role>Manager</role> </permission> + <permission> + <name>Add ERP5Subversion Tools</name> + </permission> <permission> <name>Add ERP5SyncML Tools</name> <role>Manager</role> @@ -245,10 +248,6 @@ <name>Add Plugin Registrys</name> <role>Manager</role> </permission> - <permission> - <name>Add Portal ZSyncer Tools</name> - <role>Manager</role> - </permission> <permission> <name>Add Python Scripts</name> <role>Manager</role> @@ -317,10 +316,6 @@ <name>Add ZODB Mount Points</name> <role>Manager</role> </permission> - <permission> - <name>Add ZSyncers</name> - <role>Manager</role> - </permission> <permission> <name>Add Zope Tutorials</name> <role>Manager</role> @@ -543,10 +538,6 @@ <name>Manage Transient Object Container</name> <role>Manager</role> </permission> - <permission> - <name>Manage Translation Services</name> - <role>Manager</role> - </permission> <permission> <name>Manage Vocabulary</name> <role>Manager</role> @@ -715,10 +706,6 @@ <name>WebDAV access</name> <role>Manager</role> </permission> - <permission> - <name>ZSyncer: Use ZSyncer</name> - <role>Manager</role> - </permission> <permission> <name>ZopeProfiler: manage</name> <role>Manager</role> diff --git a/bt5/erp5_banking_core/ModuleTemplateItem/counter_module.xml b/bt5/erp5_banking_core/ModuleTemplateItem/counter_module.xml index da746e9dd1..9e661a9401 100644 --- a/bt5/erp5_banking_core/ModuleTemplateItem/counter_module.xml +++ b/bt5/erp5_banking_core/ModuleTemplateItem/counter_module.xml @@ -173,6 +173,9 @@ <name>Add ERP5Form Tools</name> <role>Manager</role> </permission> + <permission> + <name>Add ERP5Subversion Tools</name> + </permission> <permission> <name>Add ERP5SyncML Tools</name> <role>Manager</role> @@ -245,10 +248,6 @@ <name>Add Plugin Registrys</name> <role>Manager</role> </permission> - <permission> - <name>Add Portal ZSyncer Tools</name> - <role>Manager</role> - </permission> <permission> <name>Add Python Scripts</name> <role>Manager</role> @@ -317,10 +316,6 @@ <name>Add ZODB Mount Points</name> <role>Manager</role> </permission> - <permission> - <name>Add ZSyncers</name> - <role>Manager</role> - </permission> <permission> <name>Add Zope Tutorials</name> <role>Manager</role> @@ -543,10 +538,6 @@ <name>Manage Transient Object Container</name> <role>Manager</role> </permission> - <permission> - <name>Manage Translation Services</name> - <role>Manager</role> - </permission> <permission> <name>Manage Vocabulary</name> <role>Manager</role> @@ -715,10 +706,6 @@ <name>WebDAV access</name> <role>Manager</role> </permission> - <permission> - <name>ZSyncer: Use ZSyncer</name> - <role>Manager</role> - </permission> <permission> <name>ZopeProfiler: manage</name> <role>Manager</role> diff --git a/bt5/erp5_banking_core/ModuleTemplateItem/currency_cash_module.xml b/bt5/erp5_banking_core/ModuleTemplateItem/currency_cash_module.xml index 1ad8c5f63a..31dea74540 100644 --- a/bt5/erp5_banking_core/ModuleTemplateItem/currency_cash_module.xml +++ b/bt5/erp5_banking_core/ModuleTemplateItem/currency_cash_module.xml @@ -173,6 +173,9 @@ <name>Add ERP5Form Tools</name> <role>Manager</role> </permission> + <permission> + <name>Add ERP5Subversion Tools</name> + </permission> <permission> <name>Add ERP5SyncML Tools</name> <role>Manager</role> @@ -245,10 +248,6 @@ <name>Add Plugin Registrys</name> <role>Manager</role> </permission> - <permission> - <name>Add Portal ZSyncer Tools</name> - <role>Manager</role> - </permission> <permission> <name>Add Python Scripts</name> <role>Manager</role> @@ -317,10 +316,6 @@ <name>Add ZODB Mount Points</name> <role>Manager</role> </permission> - <permission> - <name>Add ZSyncers</name> - <role>Manager</role> - </permission> <permission> <name>Add Zope Tutorials</name> <role>Manager</role> @@ -543,10 +538,6 @@ <name>Manage Transient Object Container</name> <role>Manager</role> </permission> - <permission> - <name>Manage Translation Services</name> - <role>Manager</role> - </permission> <permission> <name>Manage Vocabulary</name> <role>Manager</role> @@ -715,10 +706,6 @@ <name>WebDAV access</name> <role>Manager</role> </permission> - <permission> - <name>ZSyncer: Use ZSyncer</name> - <role>Manager</role> - </permission> <permission> <name>ZopeProfiler: manage</name> <role>Manager</role> diff --git a/bt5/erp5_banking_core/ModuleTemplateItem/foreign_check_module.xml b/bt5/erp5_banking_core/ModuleTemplateItem/foreign_check_module.xml index f52444fed3..c44a737b87 100644 --- a/bt5/erp5_banking_core/ModuleTemplateItem/foreign_check_module.xml +++ b/bt5/erp5_banking_core/ModuleTemplateItem/foreign_check_module.xml @@ -172,6 +172,9 @@ <name>Add ERP5Form Tools</name> <role>Manager</role> </permission> + <permission> + <name>Add ERP5Subversion Tools</name> + </permission> <permission> <name>Add ERP5SyncML Tools</name> <role>Manager</role> @@ -244,10 +247,6 @@ <name>Add Plugin Registrys</name> <role>Manager</role> </permission> - <permission> - <name>Add Portal ZSyncer Tools</name> - <role>Manager</role> - </permission> <permission> <name>Add Python Scripts</name> <role>Manager</role> @@ -316,10 +315,6 @@ <name>Add ZODB Mount Points</name> <role>Manager</role> </permission> - <permission> - <name>Add ZSyncers</name> - <role>Manager</role> - </permission> <permission> <name>Add Zope Tutorials</name> <role>Manager</role> @@ -542,10 +537,6 @@ <name>Manage Transient Object Container</name> <role>Manager</role> </permission> - <permission> - <name>Manage Translation Services</name> - <role>Manager</role> - </permission> <permission> <name>Manage Vocabulary</name> <role>Manager</role> @@ -713,10 +704,6 @@ <name>WebDAV access</name> <role>Manager</role> </permission> - <permission> - <name>ZSyncer: Use ZSyncer</name> - <role>Manager</role> - </permission> <permission> <name>ZopeProfiler: manage</name> <role>Manager</role> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkCounterDateOpen.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkCounterDateOpen.xml index 252521d814..ff14e2bc60 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkCounterDateOpen.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkCounterDateOpen.xml @@ -84,14 +84,10 @@ if site is None:\n site = site_list[0]\n \n # get only the office, not need of vault\n -if not \'siege\' in site:\n - # XXX must change the way it get the vault\n - site = site.split(\'/\')[3:4]\n -else:\n - site = \'siege\'\n -\n +context.log(\'Baobab_checkCounterDateOpen\', \'get site for vault %s\' %(site))\n +site = context.Baobab_getVaultSite(site)\n \n -kw = {"portal_type" : \'Counter Date\', "delivery.start_date" : str(date), "site_id" : site, "simulation_state" : "open"}\n +kw = {"portal_type" : \'Counter Date\', "delivery.start_date" : str(date), "site_id" : site.getId(), "simulation_state" : "open"}\n #context.log(\'Baobab_checkCounterDateOpen\', \'kw = %s\' %(kw,))\n counter_date_list = [x.getObject() for x in context.portal_catalog(**kw)]\n #context.log(\'Baobab_checkCounterDateOpen\', \'counter_date_list = %s, requete = %s\' %(counter_date_list, context.portal_catalog(src__=1, **kw)))\n diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getRemainingOperationList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getRemainingOperationList.xml new file mode 100644 index 0000000000..6afaa94229 --- /dev/null +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getRemainingOperationList.xml @@ -0,0 +1,195 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.PythonScripts.PythonScript</string> + <string>PythonScript</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>Python_magic</string> </key> + <value> <string encoding="base64">bfINCg==</string> </value> + </item> + <item> + <key> <string>Script_magic</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_bind_names</string> </key> + <value> + <object> + <klass> + <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>_asgns</string> </key> + <value> + <dictionary> + <item> + <key> <string>name_container</string> </key> + <value> <string>container</string> </value> + </item> + <item> + <key> <string>name_context</string> </key> + <value> <string>context</string> </value> + </item> + <item> + <key> <string>name_m_self</string> </key> + <value> <string>script</string> </value> + </item> + <item> + <key> <string>name_subpath</string> </key> + <value> <string>traverse_subpath</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>_body</string> </key> + <value> <string># get all operations related to ths site\n +# as source\n +kwd_source = {\'source_uid\' : site_uid, \'delivery.start_date\' : date, \'simulation_state\' : \'confirmed\'}\n +# as destination\n +kwd_destination = {\'destination_uid\' : site_uid, \'delivery.start_date\' : date, \'simulation_state\' : \'confirmed\'}\n +operation_list = list(context.portal_catalog(**kwd_source)) + list(context.portal_catalog(**kwd_destination))\n +operation_list_object = [x.getObject() for x in operation_list]\n +\n +return operation_list_object\n +</string> </value> + </item> + <item> + <key> <string>_code</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_dav_writelocks</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>_filepath</string> </key> + <value> <string>Script (Python):/baobab/portal_skins/erp5_banking_core/Baobab_getRemainingOperationList</string> </value> + </item> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string>site_uid, date, simulation_state=[]</string> </value> + </item> + <item> + <key> <string>errors</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>func_code</string> </key> + <value> + <object> + <klass> + <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>co_argcount</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>co_varnames</string> </key> + <value> + <tuple> + <string>site_uid</string> + <string>date</string> + <string>simulation_state</string> + <string>kwd_source</string> + <string>kwd_destination</string> + <string>list</string> + <string>_apply_</string> + <string>_getattr_</string> + <string>context</string> + <string>operation_list</string> + <string>append</string> + <string>$append0</string> + <string>_getiter_</string> + <string>x</string> + <string>operation_list_object</string> + </tuple> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>func_defaults</string> </key> + <value> + <tuple> + <list/> + </tuple> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>Baobab_getRemainingOperationList</string> </value> + </item> + <item> + <key> <string>warnings</string> </key> + <value> + <tuple/> + </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/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getVaultSite.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getVaultSite.xml new file mode 100644 index 0000000000..25409fe709 --- /dev/null +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getVaultSite.xml @@ -0,0 +1,167 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.PythonScripts.PythonScript</string> + <string>PythonScript</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>Python_magic</string> </key> + <value> <string encoding="base64">bfINCg==</string> </value> + </item> + <item> + <key> <string>Script_magic</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_bind_names</string> </key> + <value> + <object> + <klass> + <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>_asgns</string> </key> + <value> + <dictionary> + <item> + <key> <string>name_container</string> </key> + <value> <string>container</string> </value> + </item> + <item> + <key> <string>name_context</string> </key> + <value> <string>context</string> </value> + </item> + <item> + <key> <string>name_m_self</string> </key> + <value> <string>script</string> </value> + </item> + <item> + <key> <string>name_subpath</string> </key> + <value> <string>traverse_subpath</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>_body</string> </key> + <value> <string>from Products.ERP5Type.Message import Message\n +site = vault\n +if same_type(site, \'\'):\n + site = context.restrictedTraverse(\'portal_categories/site/%s\' %(site,))\n +\n +context.log(\'site\', site)\n +while True:\n + if not hasattr(site, \'getVaultTypeList\'):\n + msg = Message(domain = \'ui\', message = \'The site value is misconfigured; report this to system administrators.\')\n + raise ValidationFailed, (msg,)\n + if \'site\' in site.getVaultTypeList():\n + break\n + site = site.getParentValue()\n +return site\n +</string> </value> + </item> + <item> + <key> <string>_code</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_filepath</string> </key> + <value> <string>Script (Python):/baobab/portal_skins/erp5_banking_core/Baobab_getVaultSite</string> </value> + </item> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string>vault</string> </value> + </item> + <item> + <key> <string>errors</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>func_code</string> </key> + <value> + <object> + <klass> + <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>co_argcount</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>co_varnames</string> </key> + <value> + <tuple> + <string>vault</string> + <string>Products.ERP5Type.Message</string> + <string>Message</string> + <string>site</string> + <string>same_type</string> + <string>_getattr_</string> + <string>context</string> + <string>True</string> + <string>hasattr</string> + <string>msg</string> + <string>ValidationFailed</string> + </tuple> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>func_defaults</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>Baobab_getVaultSite</string> </value> + </item> + <item> + <key> <string>warnings</string> </key> + <value> + <tuple/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getMovementList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getMovementList.xml index e0954a35ea..74bb4c60f3 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getMovementList.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getMovementList.xml @@ -66,8 +66,36 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>return context.getMovementList(portal_type=portal_type)\n -</string> </value> + <value> <string encoding="cdata"><![CDATA[ + +# return context.getMovementList(portal_type=portal_type)\n +# here we suppose we have only two level of portal type\n +if not same_type(portal_type, []):\n + return context.getMovementList(portal_type=portal_type)\n +if len(portal_type) > 2 or len(portal_type) == 0:\n + # use catalog\n + return context.getMovementList(portal_type=portal_type)\n +\n +line_list = context.objectValues(portal_type=portal_type[0])\n +invert = 0\n +if len(line_list) == 0:\n + # try with the second portal type\n + line_list = context.objectValues(portal_type=portal_type[1])\n + invert = 1\n +if len(line_list) == 0:\n + return []\n +cell_list = []\n +for line in line_list:\n + if invert:\n + cell_type = portal_type[0]\n + else:\n + cell_type = portal_type[1]\n + cell_list.extend(list(line.objectValues(portal_type=cell_type)))\n +\n +return cell_list\n + + +]]></string> </value> </item> <item> <key> <string>_code</string> </key> @@ -87,7 +115,7 @@ </item> <item> <key> <string>_params</string> </key> - <value> <string>portal_type=None, *argv, **kw</string> </value> + <value> <string>portal_type=[], *argv, **kw</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -116,8 +144,18 @@ <string>portal_type</string> <string>argv</string> <string>kw</string> + <string>same_type</string> <string>_getattr_</string> <string>context</string> + <string>len</string> + <string>_getitem_</string> + <string>line_list</string> + <string>invert</string> + <string>cell_list</string> + <string>_getiter_</string> + <string>line</string> + <string>cell_type</string> + <string>list</string> </tuple> </value> </item> @@ -130,7 +168,7 @@ <key> <string>func_defaults</string> </key> <value> <tuple> - <none/> + <list/> </tuple> </value> </item> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml index 34163e7b93..2692251eca 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml @@ -99,8 +99,8 @@ def l_split(line) :\n new_e_list.append(e)\n return new_e_list\n \n -def create_category(cat) :\n -\n +def create_category(cat, vault_type=None) :\n + context.log(\'create_category\',cat)\n cat_list = lowerCase(cat).split(\'/\')\n cat_len = len(cat_list)\n \n @@ -116,21 +116,30 @@ def create_category(cat) :\n \n if relative_category is None :\n relative_category = create_category(lowerCase(\'/\'.join(cat_list[:-1])))\n + if vault_type is not None:\n + relative_category.setVaultType(vault_type)\n \n cat = relative_category.get(lowerCase(cat_list[-1]))\n if cat is not None :\n return cat\n else :\n - return relative_category.newContent(portal_type = \'Category\',\n - id = lowerCase(cat_list[-1]),\n - title = upperCase(cat_list[-1]))\n + new_cat = relative_category.newContent(portal_type = \'Category\',\n + id = lowerCase(cat_list[-1]),\n + title = upperCase(cat_list[-1]))\n + if vault_type is not None:\n + new_cat.setVaultType(vault_type)\n + return new_cat\n \n def generate_vault_dict() :\n c_list = context.portal_categories.vault_type.getCategoryChildValueList()\n + # function to sort category by title\n + def sortCategory(a, b):\n + return cmp(a.getRelativeUrl(), b.getRelativeUrl())\n vault_dict = {}\n - for c in c_list :\n + c_list.sort(sortCategory)\n + for c in c_list:\n code = c.getProperty(\'codification\')\n - if code is not None :\n + if code is not None and not vault_dict.has_key(code):\n vault_dict[code]=c.getRelativeUrl()\n return vault_dict\n \n @@ -176,37 +185,89 @@ elif import_type == \'assign_codification\' :\n \n elif import_type == \'assign_vault_type\' :\n vault_type_dict = generate_vault_dict()\n + context.log(\'vault_type_dict\', vault_type_dict)\n vault_type_list = vault_type_dict.keys()\n for e_list in line_list :\n if len(e_list) == 2 and e_list[1] in vault_type_list :\n category = context.portal_categories.getCategoryValue(lowerCase(e_list[0]))\n category.setCategoryList([vault_type_dict[e_list[1]]])\n - print \'set %s to %s\' % ([vault_type_dict[e_list[1]]], category)\n + print \'set %s to %s for e_list %s\' % ([vault_type_dict[e_list[1]]], category, e_list)\n +\n \n elif import_type == \'create_subvaults\' :\n #Encaisse des Billets Restitues par Tiers a Detruire# seulemnt sur sites disposant de tri tiers\n #Encaisse des Billets Recus pour Ventilation# seulement sur sites principaux\n subvault_dict = {}\n for e_list in line_list :\n + context.log(\'e_list\', e_list)\n if len(e_list) == 3 :\n - vault = lowerCase(e_list[0])\n - subvault = upperCase(e_list[1])\n - subvault_code = upperCase(e_list[2])\n + vault = lowerCase(e_list[0]) # ex : Vault_Type/Site/caveau/Auxiliaire\n + subvault = upperCase(e_list[1]) # ex : Encaisse des Devises\n + subvault_code = upperCase(e_list[2]) # ex : D\n + counter_string_list = [] # the list of counters, like [\'guichet_1,entrant\',...]\n + one_way_counter_list = (\'gros_paiement\',\'gros_versement\')\n + two_way_counter_list = (\'banque_interne\',\'operations_diverses\')\n + counter_list = one_way_counter_list + two_way_counter_list\n + max_counter = 3 # we may not have always the same number of counters\n + counter_name = vault.split(\'/\')[-1]\n + # add as many counters as required\n + if counter_name in counter_list:\n + if counter_name in one_way_counter_list:\n + max_counter=2\n + for i in range(1,max_counter+1):\n +# if counter_name in two_way_counter_list:\n +# counter_string_list.append(\'guichet_%s/entrante\' % i)\n +# counter_string_list.append(\'guichet_%s/sortante\' % i)\n +# else:\n + counter_string_list.append(\'guichet_%s\' % i)\n + else:\n + counter_string_list = [\'\']\n +\n + context.log(\'counter_string_list\',counter_string_list)\n if not subvault_dict.has_key(vault) :\n subvault_dict[vault] = []\n - subvault_dict[vault].append([subvault, subvault_code])\n - if subvault == \'Encaisse des Devises\' :\n - for c in context.currency.objectValues() :\n - if c.getId() != context.Baobab_getPortalReferenceCurrencyID():\n - subvault_dict[vault].append([\'%s/%s\' % (subvault, c.getTitle()), None])\n - if subvault == \'Encaisse des Billets Recus pour Ventilation\' :\n - for c in context.portal_categories.site.agence.principale.objectIds() :\n - subvault_dict[vault].append([\'%s/%s\' % (subvault, upperCase(c)), None])\n + for counter_string in counter_string_list:\n + context.log(\'counter_string\', counter_string)\n + if counter_string != \'\':\n + counter_subvault = \'%s/%s\' % (counter_string,subvault)\n + else:\n + counter_subvault = subvault\n + context.log(\'counter_subvault\', counter_subvault)\n + subvault_dict[vault].append([counter_subvault, subvault_code])\n + if subvault == \'Encaisse des Devises\' :\n + for c in context.currency_module.objectValues() :\n + if c.getId() != context.Baobab_getPortalReferenceCurrencyID():\n + if counter_name in two_way_counter_list:\n + context.log(\'add encaisse des billets et monnaies E/S\',counter_subvault)\n + subvault_dict[vault].append([\'%s/%s/%s\' % (counter_subvault, c.getTitle(), "entrante"), None])\n + subvault_dict[vault].append([\'%s/%s/%s\' % (counter_subvault, c.getTitle(), "sortante"), None])\n + else:\n + context.log(\'add encaisse des billets et monnaies\',counter_subvault)\n + subvault_dict[vault].append([\'%s/%s\' % (counter_subvault, c.getTitle()), None])\n + if subvault == \'Encaisse des Billets Recus pour Ventilation\' :\n + for c in context.portal_categories.site.agence.principale.objectIds() :\n + if counter_name in two_way_counter_list:\n + context.log(\'add ventilation E/S\', counter_subvault)\n + subvault_dict[vault].append([\'%s/%s/%s\' % (counter_subvault, upperCase(c), "entrante"), None])\n + subvault_dict[vault].append([\'%s/%s/%s\' % (counter_subvault, upperCase(c), "sortante"), None])\n + else:\n + context.log(\'add ventilation\', counter_subvault)\n + subvault_dict[vault].append([\'%s/%s\' % (counter_subvault, upperCase(c)), None])\n +\n + # subvault_dict looks like this :\n + #subvault_dict : {\'vault_type/site/surface/operations_diverses\': [[\'Encaisse des Devises\', \'D\'], [\'Encaisse des Devises/Francs Suisses\', None], \n + # [\'Encaisse des Billets et Monnaies\', \'A\']]}\n +\n +\n \n vault_type_list = subvault_dict.keys()\n + context.log("vault_type_list", vault_type_list)\n + context.log("vault_type_dict :",subvault_dict)\n \n + # parse the for site category tree and add sub categories if required\n for c in context.portal_categories.site.getCategoryChildValueList() :\n for vault_type in vault_type_list :\n + context.log("c = %s, vault_type = %s" %(c, vault_type), "c.getvaultType = %s" %(c.getVaultType()))\n if context.portal_categories.isMemberOf(c, vault_type, strict=1) :\n print c.getRelativeUrl(), \'is\', vault_type\n for subvault_data in subvault_dict[vault_type] :\n @@ -221,14 +282,22 @@ elif import_type == \'create_subvaults\' :\n pass\n else :\n print \' creating\', subvault_path\n - new_category_obj = create_category(\'%s/%s\' % (c.getRelativeUrl(), subvault_path))\n - if subvault_code not in (None, \'\'):\n - new_category_obj.setCodification(subvault_code)\n + if \'guichet\' in subvault_path:\n + subcat_vault_type = \'%s/guichet\' %(\'/\'.join(vault_type.split(\'/\')[1:]),)\n + else:\n + subcat_vault_type = \'/\'.join(vault_type.split(\'/\')[1:]) \n + new_category_obj = create_category(cat = \'%s/%s\' % (c.getRelativeUrl(), subvault_path), vault_type = subcat_vault_type)\n else :\n print \' creating\', subvault_path\n - new_category_obj = create_category(\'%s/%s\' % (c.getRelativeUrl(), subvault_path))\n - if subvault_code not in (None, \'\'):\n - new_category_obj.setCodification(subvault_code)\n + if \'guichet\' in subvault_path:\n + subcat_vault_type = \'%s/guichet\' %(\'/\'.join(vault_type.split(\'/\')[1:]),)\n + else:\n + subcat_vault_type = \'/\'.join(vault_type.split(\'/\')[1:])\n + new_category_obj = create_category(cat = \'%s/%s\' % (c.getRelativeUrl(), subvault_path), vault_type = subcat_vault_type)\n + # set codification\n + if subvault_code not in (None, \'\'):\n + new_category_obj.setCodification(subvault_code)\n + \n print\n break\n else : print c.getRelativeUrl(), \'not here\'\n @@ -251,6 +320,12 @@ return printed\n <none/> </value> </item> + <item> + <key> <string>_dav_writelocks</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> <item> <key> <string>_filepath</string> </key> <value> <string>Script (Python):/baobab/portal_skins/erp5_banking_core/ImportCsvToCategories</string> </value> @@ -297,13 +372,13 @@ return printed\n <string>upperCase</string> <string>l_clean</string> <string>l_split</string> + <string>None</string> <string>create_category</string> <string>generate_vault_dict</string> <string>_getattr_</string> <string>context</string> <string>request</string> <string>getattr</string> - <string>None</string> <string>import_type</string> <string>line_list</string> <string>append</string> @@ -322,11 +397,22 @@ return printed\n <string>vault</string> <string>subvault</string> <string>subvault_code</string> + <string>counter_string_list</string> + <string>one_way_counter_list</string> + <string>two_way_counter_list</string> + <string>counter_list</string> + <string>max_counter</string> + <string>counter_name</string> + <string>range</string> + <string>i</string> <string>_write_</string> + <string>counter_string</string> + <string>counter_subvault</string> <string>c</string> <string>vault_type</string> <string>subvault_data</string> <string>subvault_path</string> + <string>subcat_vault_type</string> <string>new_category_obj</string> </tuple> </value> @@ -359,4 +445,25 @@ return printed\n </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/> + </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/scripts/closeAllCounter.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/scripts/closeAllCounter.xml index c83f1c5172..8e8b88e15f 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/scripts/closeAllCounter.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/scripts/closeAllCounter.xml @@ -69,7 +69,7 @@ <value> <string># put all counter in closing state for the given site\n transaction = state_change.object\n \n -site = transaction.getSourceValue()\n +site = transaction.getSiteValue()\n while True:\n if not hasattr(site, \'getVaultTypeList\'):\n msg = Message(domain = \'ui\', message = \'The site value is misconfigured; report this to system administrators.\')\n diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts/cancelRemainingOperation.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts/cancelRemainingOperation.xml index f6a28d9e64..6e5380fb6e 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts/cancelRemainingOperation.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts/cancelRemainingOperation.xml @@ -71,14 +71,8 @@ from Products.DCWorkflow.DCWorkflow import ValidationFailed\n from Products.ERP5Type.Message import Message\n \n transaction = state_change.object\n -site = transaction.getSourceValue()\n -while True:\n - if not hasattr(site, \'getVaultTypeList\'):\n - msg = Message(domain = \'ui\', message = \'The site value is misconfigured; report this to system administrators.\')\n - raise ValidationFailed, (msg,)\n - if \'site\' in site.getVaultTypeList():\n - break\n - site = site.getParentValue()\n +\n +site = transaction.Baobab_getVaultSite(vault=transaction.getSourceValue())\n \n # get the current counter date\n kwd = {\'portal_type\' : \'Accounting Date\', \'simulation_state\' : \'open\', \'site_uid\' : site.getUid()}\n @@ -91,13 +85,17 @@ else:\n current_date = date_list[0].getStartDate()\n \n site_uid = transaction.getSiteUid()\n +\n # get all operations related to this counter\n -# as source\n -kwd_source = {\'source_uid\' : site_uid, \'delivery.start_date\' : current_date, \'simulation_state\' : \'confirmed\'}\n -# as destination\n -kwd_destination = {\'destination_uid\' : site_uid, \'delivery.start_date\' : current_date, \'simulation_state\' : \'confirmed\'}\n -operation_list = list(context.portal_catalog(**kwd_source)) + list(context.portal_catalog(**kwd_destination))\n -operation_list_object = [x.getObject() for x in operation_list]\n +# # as source\n +# kwd_source = {\'source_uid\' : site_uid, \'delivery.start_date\' : current_date, \'simulation_state\' : \'confirmed\'}\n +# # as destination\n +# kwd_destination = {\'destination_uid\' : site_uid, \'delivery.start_date\' : current_date, \'simulation_state\' : \'confirmed\'}\n +# operation_list = list(context.portal_catalog(**kwd_source)) + list(context.portal_catalog(**kwd_destination))\n +# operation_list_object = [x.getObject() for x in operation_list]\n +\n +operation_list_object = transaction.Baobab_getRemainingOperationList(site_uid=site_uid, date=current_date, simulation_state=[\'confirmed\',])\n + \n context.log(\'counter_workflow, cancelRemainingOperation\', \'operation list = %s\' %(operation_list_object,))\n \n for operation in operation_list_object:\n @@ -165,9 +163,6 @@ for operation in operation_list_object:\n <string>_getattr_</string> <string>transaction</string> <string>site</string> - <string>True</string> - <string>hasattr</string> - <string>msg</string> <string>kwd</string> <string>append</string> <string>$append0</string> @@ -179,12 +174,9 @@ for operation in operation_list_object:\n <string>None</string> <string>current_date</string> <string>len</string> + <string>msg</string> <string>_getitem_</string> <string>site_uid</string> - <string>kwd_source</string> - <string>kwd_destination</string> - <string>list</string> - <string>operation_list</string> <string>operation_list_object</string> <string>operation</string> </tuple> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts/checkDateOpened.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts/checkDateOpened.xml index ab11b2bdce..a2744784cd 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts/checkDateOpened.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts/checkDateOpened.xml @@ -71,7 +71,8 @@ from Products.DCWorkflow.DCWorkflow import ValidationFailed\n from Products.ERP5Type.Message import Message\n \n transaction = state_change.object\n -site = transaction.getSourceValue()\n +site = transaction.getSiteValue()\n +\n while True:\n if not hasattr(site, \'getVaultTypeList\'):\n msg = Message(domain = \'ui\', message = \'The site value is misconfigured; report this to system administrators.\')\n @@ -80,11 +81,11 @@ while True:\n break\n site = site.getParentValue()\n \n -kwd = {\'portal_type\' : \'Accounting Date\', \'simulation_state\' : \'open\', \'site_uid\' : site.getUid()}\n +kwd = {\'portal_type\' : \'Counter Date\', \'simulation_state\' : \'open\', \'site_uid\' : site.getUid()}\n date_list = [x.getObject() for x in context.portal_catalog(**kwd)]\n \n if len(date_list) == 0:\n - msg = Message(domain=\'ui\', message="Accounting date is not opened.")\n + msg = Message(domain=\'ui\', message="Counter date is not opened.")\n raise ValidationFailed, (msg,)\n </string> </value> </item> diff --git a/bt5/erp5_banking_core/bt/template_portal_type_roles_list b/bt5/erp5_banking_core/bt/template_portal_type_roles_list index 113e3a8e6f..e69de29bb2 100644 --- a/bt5/erp5_banking_core/bt/template_portal_type_roles_list +++ b/bt5/erp5_banking_core/bt/template_portal_type_roles_list @@ -1,3 +0,0 @@ -Account -Account Module -Checkbook Module \ No newline at end of file -- 2.30.9