From 641f7c8ef44956de4be41ecdef218aed8bc82633 Mon Sep 17 00:00:00 2001 From: Sebastien Robin <seb@nexedi.com> Date: Fri, 18 Aug 2006 14:46:33 +0000 Subject: [PATCH] 2006-08-11 aurel * improve view for counter module inventory report 2006-08-16 seb added more checks on source and destination git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9261 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../Cash%20Container/metadata.xml | 89 --- .../portal_types/Cash%20Container/view.xml | 89 --- .../Counter%20Module/vaul_inventory.xml | 89 --- .../Counter%20Module/vaul_situation.xml | 89 --- .../vault_classification_result.xml | 89 --- .../vault_currency_situation.xml | 89 --- .../vault_extern_situation.xml | 89 --- .../vault_to_sort_situation.xml | 89 --- .../portal_categories/vault_type.xml | 6 + .../ModuleTemplateItem/check_module.xml | 558 ++++++++++++------ .../checkbook_model_module.xml | 3 - .../ModuleTemplateItem/checkbook_module.xml | 3 - .../counter_date_module.xml | 3 - .../ModuleTemplateItem/counter_module.xml | 3 - .../currency_cash_module.xml | 3 - .../foreign_check_module.xml | 3 - .../allowed_content_types.xml | 9 - .../base_category_list.xml | 6 - .../hidden_content_type_list.xml | 8 - .../workflow_chain_type.xml | 10 +- .../Base_checkBaobabSourceAndDestination.xml | 178 ++++++ ...Delivery_generateCashDetailInputDialog.xml | 4 +- .../listbox.xml | 6 - .../listbox_cash_status.xml | 6 - .../listbox_column.xml | 275 +++++++++ .../listbox_column1.xml | 6 - .../listbox_column10.xml | 6 - .../listbox_column11.xml | 6 - .../listbox_column12.xml | 6 - .../listbox_column13.xml | 6 - .../listbox_column14.xml | 6 - .../listbox_column15.xml | 6 - .../listbox_column2.xml | 6 - .../listbox_column3.xml | 6 - .../listbox_column4.xml | 6 - .../listbox_column5.xml | 6 - .../listbox_column6.xml | 6 - .../listbox_column7.xml | 6 - .../listbox_column8.xml | 6 - .../listbox_column9.xml | 6 - .../listbox_displayed_resource.xml | 6 - .../listbox_emission_letter.xml | 6 - .../listbox_number_line_to_add.xml | 6 - .../listbox_price.xml | 6 - .../listbox_resource_id.xml | 6 - .../listbox_variation.xml | 6 - .../my_calculated_price.xml | 6 - .../my_cash_status_list.xml | 6 - .../my_emission_letter_list.xml | 6 - .../my_line_portal_type.xml | 6 - .../my_operation_currency.xml | 6 - .../my_other_parameter.xml | 6 - .../my_variation_list.xml | 6 - .../CounterModule_getVaultTransactionList.xml | 14 +- .../CurrencyPurchase_getQuantity.xml | 27 + .../CurrencySale_getQuantity.xml | 27 + .../ImportCsvToCategories.xml | 17 +- .../portal_workflow/check_workflow.xml | 6 +- .../check_workflow/states/confirmed.xml | 61 ++ .../check_workflow/states/draft.xml | 17 +- .../check_workflow/transitions/cancel.xml | 1 + .../transitions/cancel_action.xml | 1 + .../check_workflow/transitions/deliver.xml | 1 + .../transitions/deliver_action.xml | 1 + .../counter_date_workflow/scripts.xml | 6 - .../scripts/closeAllCounter.xml | 8 - .../scripts/openAllCounter.xml | 6 - .../counter_date_workflow/states.xml | 6 - .../counter_date_workflow/states/closed.xml | 6 - .../counter_date_workflow/states/draft.xml | 6 - .../counter_date_workflow/states/open.xml | 6 - .../counter_date_workflow/transitions.xml | 6 - .../transitions/close.xml | 6 - .../transitions/close_action.xml | 6 - .../transitions/open.xml | 6 - .../transitions/open_action.xml | 6 - .../counter_date_workflow/variables.xml | 6 - .../variables/action.xml | 6 - .../counter_date_workflow/worklists.xml | 6 - .../counter_workflow/scripts.xml | 6 - .../scripts/cancelRemainingOperation.xml | 6 - .../scripts/checkDateOpened.xml | 6 - .../counter_workflow/states.xml | 6 - .../counter_workflow/states/closed.xml | 6 - .../counter_workflow/states/closing.xml | 6 - .../counter_workflow/states/open.xml | 6 - .../counter_workflow/states/paused.xml | 6 - .../counter_workflow/transitions.xml | 6 - .../counter_workflow/transitions/close.xml | 6 - .../transitions/close_action.xml | 6 - .../counter_workflow/transitions/dispose.xml | 6 - .../transitions/dispose_action.xml | 6 - .../counter_workflow/transitions/open.xml | 6 - .../transitions/open_action.xml | 6 - .../counter_workflow/transitions/pause.xml | 6 - .../transitions/pause_action.xml | 6 - .../counter_workflow/variables.xml | 6 - .../counter_workflow/variables/action.xml | 6 - .../counter_workflow/worklists.xml | 6 - bt5/erp5_banking_core/bt/change_log | 3 + .../bt/template_action_path_list | 10 - ...late_portal_type_allowed_content_type_list | 3 - .../template_portal_type_base_category_list | 2 - ...plate_portal_type_hidden_content_type_list | 2 - .../template_portal_type_workflow_chain_list | 2 + 105 files changed, 1009 insertions(+), 1362 deletions(-) delete mode 100644 bt5/erp5_banking_core/ActionTemplateItem/portal_types/Cash%20Container/metadata.xml delete mode 100644 bt5/erp5_banking_core/ActionTemplateItem/portal_types/Cash%20Container/view.xml delete mode 100644 bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vaul_inventory.xml delete mode 100644 bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vaul_situation.xml delete mode 100644 bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_classification_result.xml delete mode 100644 bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_currency_situation.xml delete mode 100644 bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_extern_situation.xml delete mode 100644 bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_to_sort_situation.xml delete mode 100644 bt5/erp5_banking_core/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml create mode 100644 bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_checkBaobabSourceAndDestination.xml create mode 100644 bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column.xml diff --git a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Cash%20Container/metadata.xml b/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Cash%20Container/metadata.xml deleted file mode 100644 index 6cff1dc64a..0000000000 --- a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Cash%20Container/metadata.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.ActionInformation</string> - <string>ActionInformation</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>action</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>category</string> </key> - <value> <string>object_view</string> </value> - </item> - <item> - <key> <string>condition</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>icon</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>metadata</string> </value> - </item> - <item> - <key> <string>permissions</string> </key> - <value> - <tuple> - <string>Manage portal</string> - </tuple> - </value> - </item> - <item> - <key> <string>priority</string> </key> - <value> <float>3.0</float> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Metadata</string> </value> - </item> - <item> - <key> <string>visible</string> </key> - <value> <int>1</int> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.Expression</string> - <string>Expression</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>text</string> </key> - <value> <string>string:${object_url}/Base_viewMetadata</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Cash%20Container/view.xml b/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Cash%20Container/view.xml deleted file mode 100644 index 12cd97e001..0000000000 --- a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Cash%20Container/view.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.ActionInformation</string> - <string>ActionInformation</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>action</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>category</string> </key> - <value> <string>object_view</string> </value> - </item> - <item> - <key> <string>condition</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>icon</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>view</string> </value> - </item> - <item> - <key> <string>permissions</string> </key> - <value> - <tuple> - <string>View</string> - </tuple> - </value> - </item> - <item> - <key> <string>priority</string> </key> - <value> <float>1.0</float> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>View</string> </value> - </item> - <item> - <key> <string>visible</string> </key> - <value> <int>1</int> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.Expression</string> - <string>Expression</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>text</string> </key> - <value> <string>string:${object_url}/CashContainer_view</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vaul_inventory.xml b/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vaul_inventory.xml deleted file mode 100644 index fc29345c72..0000000000 --- a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vaul_inventory.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.ActionInformation</string> - <string>ActionInformation</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>action</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>category</string> </key> - <value> <string>object_report</string> </value> - </item> - <item> - <key> <string>condition</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>icon</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>vaul_inventory</string> </value> - </item> - <item> - <key> <string>permissions</string> </key> - <value> - <tuple> - <string>View</string> - </tuple> - </value> - </item> - <item> - <key> <string>priority</string> </key> - <value> <float>5.0</float> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Vault Inventory</string> </value> - </item> - <item> - <key> <string>visible</string> </key> - <value> <int>1</int> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.Expression</string> - <string>Expression</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>text</string> </key> - <value> <string>string:${object_url}/CounterModule_viewInventoryReportDialog</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vaul_situation.xml b/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vaul_situation.xml deleted file mode 100644 index 92c1d4974c..0000000000 --- a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vaul_situation.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.ActionInformation</string> - <string>ActionInformation</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>action</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>category</string> </key> - <value> <string>object_report</string> </value> - </item> - <item> - <key> <string>condition</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>icon</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>vaul_situation</string> </value> - </item> - <item> - <key> <string>permissions</string> </key> - <value> - <tuple> - <string>View</string> - </tuple> - </value> - </item> - <item> - <key> <string>priority</string> </key> - <value> <float>6.0</float> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Vault Situation</string> </value> - </item> - <item> - <key> <string>visible</string> </key> - <value> <int>1</int> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.Expression</string> - <string>Expression</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>text</string> </key> - <value> <string>string:${object_url}/CounterModule_viewVaultSituationReportDialog</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_classification_result.xml b/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_classification_result.xml deleted file mode 100644 index d72b0a72f5..0000000000 --- a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_classification_result.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.ActionInformation</string> - <string>ActionInformation</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>action</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>category</string> </key> - <value> <string>object_report</string> </value> - </item> - <item> - <key> <string>condition</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>icon</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>vault_classification_result</string> </value> - </item> - <item> - <key> <string>permissions</string> </key> - <value> - <tuple> - <string>View</string> - </tuple> - </value> - </item> - <item> - <key> <string>priority</string> </key> - <value> <float>10.0</float> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Vault Classification Result</string> </value> - </item> - <item> - <key> <string>visible</string> </key> - <value> <int>1</int> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.Expression</string> - <string>Expression</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>text</string> </key> - <value> <string>string:${object_url}/CounterModule_viewVaultClassificationReportDialog</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_currency_situation.xml b/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_currency_situation.xml deleted file mode 100644 index 210c9ecaa4..0000000000 --- a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_currency_situation.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.ActionInformation</string> - <string>ActionInformation</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>action</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>category</string> </key> - <value> <string>object_report</string> </value> - </item> - <item> - <key> <string>condition</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>icon</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>vault_currency_situation</string> </value> - </item> - <item> - <key> <string>permissions</string> </key> - <value> - <tuple> - <string>View</string> - </tuple> - </value> - </item> - <item> - <key> <string>priority</string> </key> - <value> <float>7.0</float> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Vault Currency Situation</string> </value> - </item> - <item> - <key> <string>visible</string> </key> - <value> <int>1</int> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.Expression</string> - <string>Expression</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>text</string> </key> - <value> <string>string:${object_url}/CounterModule_viewVaultCurrencyReportDialog</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_extern_situation.xml b/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_extern_situation.xml deleted file mode 100644 index 15229e7683..0000000000 --- a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_extern_situation.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.ActionInformation</string> - <string>ActionInformation</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>action</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>category</string> </key> - <value> <string>object_report</string> </value> - </item> - <item> - <key> <string>condition</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>icon</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>vault_extern_situation</string> </value> - </item> - <item> - <key> <string>permissions</string> </key> - <value> - <tuple> - <string>View</string> - </tuple> - </value> - </item> - <item> - <key> <string>priority</string> </key> - <value> <float>8.0</float> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Vault Extern Situation</string> </value> - </item> - <item> - <key> <string>visible</string> </key> - <value> <int>1</int> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.Expression</string> - <string>Expression</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>text</string> </key> - <value> <string>string:${object_url}/CounterModule_viewVaultExternReportDialog</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_to_sort_situation.xml b/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_to_sort_situation.xml deleted file mode 100644 index af437d3f41..0000000000 --- a/bt5/erp5_banking_core/ActionTemplateItem/portal_types/Counter%20Module/vault_to_sort_situation.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.ActionInformation</string> - <string>ActionInformation</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>action</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>category</string> </key> - <value> <string>object_report</string> </value> - </item> - <item> - <key> <string>condition</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>icon</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>vault_to_sort_situation</string> </value> - </item> - <item> - <key> <string>permissions</string> </key> - <value> - <tuple> - <string>View</string> - </tuple> - </value> - </item> - <item> - <key> <string>priority</string> </key> - <value> <float>9.0</float> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Vault To Sort Situation</string> </value> - </item> - <item> - <key> <string>visible</string> </key> - <value> <int>1</int> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.Expression</string> - <string>Expression</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>text</string> </key> - <value> <string>string:${object_url}/CounterModule_viewVaultToSortReportDialog</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> 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 bade3907e8..3f00643af7 100644 --- a/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/vault_type.xml +++ b/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/vault_type.xml @@ -30,6 +30,12 @@ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> </item> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>_tree</string> </key> <value> diff --git a/bt5/erp5_banking_core/ModuleTemplateItem/check_module.xml b/bt5/erp5_banking_core/ModuleTemplateItem/check_module.xml index fce20d8bba..f0d688eed9 100644 --- a/bt5/erp5_banking_core/ModuleTemplateItem/check_module.xml +++ b/bt5/erp5_banking_core/ModuleTemplateItem/check_module.xml @@ -1,515 +1,717 @@ <module> <id>check_module</id> <permission_list> - <permission type='list'> + <permission type='tuple'> <name>Access Transient Objects</name> - </permission> - <permission type='list'> + <role>Assignee</role> + <role>Assignor</role> + <role>Associate</role> + <role>Auditor</role> + <role>Author</role> + <role>Manager</role> + </permission> + <permission type='tuple'> <name>Access arbitrary user session data</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Access contents information</name> - </permission> - <permission type='list'> + <role>Assignee</role> + <role>Assignor</role> + <role>Associate</role> + <role>Auditor</role> + <role>Author</role> + <role>Manager</role> + </permission> + <permission type='tuple'> <name>Access future portal content</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Access inactive portal content</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Access session data</name> - </permission> - <permission type='list'> + <role>Assignee</role> + <role>Assignor</role> + <role>Associate</role> + <role>Auditor</role> + <role>Author</role> + <role>Manager</role> + </permission> + <permission type='tuple'> <name>Add Accelerated HTTP Cache Managers</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add BTreeFolder2s</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Browser Id Manager</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMF Action Icons Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMF Active Processs</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMF Caching Policy Managers</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMF Calendar Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMF Core Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMF Default Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMF Report Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMF Setup Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMF Sites</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMF Unique Id Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMFActivity Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMFCategory Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add CMFMailIn Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Configured CMF Sites</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Content Type Registrys</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Cookie Crumblers</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Database Methods</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Documents, Images, and Files</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5 Filesystem Formulator Forms</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5 Forms</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5 OOo Templates</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5 PDF Forms</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5 PDF Templates</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5 Publications</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5 Reports</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5 Sites</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5 Subscriptions</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5 Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5Catalog Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5Form Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5Subversion Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5SyncML Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ERP5Type Tools</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ExtFiles</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ExtImages</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add External Methods</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Filesystem Directory Views</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Folders</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Formulator Forms</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add LocalContents</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add LocalFolders</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Localizers</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add MailHost objects</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add MessageCatalogs</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Page Templates</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Photo Folders</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Photos</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Pluggable Index</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Plugin Registrys</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Python Scripts</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add RAM Cache Managers</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ReStructuredText Documents</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Session Data Manager</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Site Roots</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Temporary Folder</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Transient Object Container</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add User Folders</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Versions</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Virtual Host Monsters</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Vocabularies</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Z Gadfly Database Connections</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Z MySQL Database Connections</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Z MySQL Database Deferred Connections</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ZCatalogs</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ZMailIn Clients</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ZMailMessages</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add ZODB Mount Points</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add Zope Tutorials</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add portal content</name> + <role>Assignor</role> + <role>Author</role> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add portal events</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add portal folders</name> + <role>Assignor</role> + <role>Author</role> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add portal member</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Add portal topics</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Browser Id Manager</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change DTML Documents</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change DTML Methods</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Database Connections</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Database Methods</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change ExtFile/ExtImage</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change External Methods</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Formulator Fields</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Formulator Forms</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Images and Files</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Lock Information</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Page Templates</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Photo</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Python Scripts</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Session Data Manager</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change Versions</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change ZMailIn</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change ZMailMessages</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change bindings</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change cache managers</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change cache settings</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change configuration</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change local roles</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change permissions</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change portal events</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change portal topics</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Change proxy roles</name> + <role>Manager</role> </permission> - <permission type='list'> - <name>Change user folder</name> - </permission> - <permission type='list'> + <permission type='tuple'> <name>Copy or Move</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Create Transient Objects</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Create class instances</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Define permissions</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Delete objects</name> + <role>Assignor</role> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Download ExtFile/ExtImage</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Edit Factories</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Edit ReStructuredText</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>FTP access</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Import/Export objects</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Join/leave Versions</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>List folder contents</name> - </permission> - <permission type='list'> + <role>Assignee</role> + <role>Assignor</role> + <role>Associate</role> + <role>Auditor</role> + <role>Author</role> + <role>Manager</role> + </permission> + <permission type='tuple'> <name>List portal members</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>List undoable changes</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Log Site Errors</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Log to the Event Log</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Mail forgotten password</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage Access Rules</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage Groups</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage Transient Object Container</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage Vocabulary</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage WebDAV Locks</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage Z Classes</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage ZCatalog Entries</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage ZCatalogIndex Entries</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage extensions</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage languages</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage messages</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage portal</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage properties</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Manage users</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Modify Cookie Crumblers</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Modify portal content</name> + <role>Assignor</role> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Open/Close Database Connection</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Open/Close Database Connections</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Post mail to ZMailIn</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Query Vocabulary</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Reply to item</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Request review</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Review portal content</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Save/discard Version changes</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Search ZCatalog</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Search for principals</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Set own password</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Set own properties</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Take ownership</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Test Database Connections</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Translate Content</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Undo changes</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Use Database Methods</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Use Factories</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Use external editor</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>Use mailhost services</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>View</name> - </permission> - <permission type='list'> + <role>Assignee</role> + <role>Assignor</role> + <role>Associate</role> + <role>Auditor</role> + <role>Author</role> + <role>Manager</role> + </permission> + <permission type='tuple'> <name>View History</name> - </permission> - <permission type='list'> + <role>Assignee</role> + <role>Assignor</role> + <role>Associate</role> + <role>Auditor</role> + <role>Author</role> + <role>Manager</role> + </permission> + <permission type='tuple'> <name>View ZMailMessage</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>View management screens</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>WebDAV Lock items</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>WebDAV Unlock items</name> + <role>Manager</role> </permission> - <permission type='list'> + <permission type='tuple'> <name>WebDAV access</name> + <role>Manager</role> </permission> </permission_list> <portal_type>Check Module</portal_type> diff --git a/bt5/erp5_banking_core/ModuleTemplateItem/checkbook_model_module.xml b/bt5/erp5_banking_core/ModuleTemplateItem/checkbook_model_module.xml index e49938e05f..966051ecdc 100644 --- a/bt5/erp5_banking_core/ModuleTemplateItem/checkbook_model_module.xml +++ b/bt5/erp5_banking_core/ModuleTemplateItem/checkbook_model_module.xml @@ -457,9 +457,6 @@ <name>Change proxy roles</name> <role>Manager</role> </permission> - <permission type='tuple'> - <name>Change user folder</name> - </permission> <permission type='tuple'> <name>Copy or Move</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 e1341ba042..5dec421bcd 100644 --- a/bt5/erp5_banking_core/ModuleTemplateItem/checkbook_module.xml +++ b/bt5/erp5_banking_core/ModuleTemplateItem/checkbook_module.xml @@ -446,9 +446,6 @@ <name>Change proxy roles</name> <role>Manager</role> </permission> - <permission type='tuple'> - <name>Change user folder</name> - </permission> <permission type='tuple'> <name>Copy or Move</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 0f7e817fe8..4208edbf31 100644 --- a/bt5/erp5_banking_core/ModuleTemplateItem/counter_date_module.xml +++ b/bt5/erp5_banking_core/ModuleTemplateItem/counter_date_module.xml @@ -455,9 +455,6 @@ <name>Change proxy roles</name> <role>Manager</role> </permission> - <permission type='tuple'> - <name>Change user folder</name> - </permission> <permission type='tuple'> <name>Copy or Move</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 c24767fcd4..c2083767e4 100644 --- a/bt5/erp5_banking_core/ModuleTemplateItem/counter_module.xml +++ b/bt5/erp5_banking_core/ModuleTemplateItem/counter_module.xml @@ -455,9 +455,6 @@ <name>Change proxy roles</name> <role>Manager</role> </permission> - <permission type='tuple'> - <name>Change user folder</name> - </permission> <permission type='tuple'> <name>Copy or Move</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 9994f4da05..6f1adffaea 100644 --- a/bt5/erp5_banking_core/ModuleTemplateItem/currency_cash_module.xml +++ b/bt5/erp5_banking_core/ModuleTemplateItem/currency_cash_module.xml @@ -455,9 +455,6 @@ <name>Change proxy roles</name> <role>Manager</role> </permission> - <permission type='tuple'> - <name>Change user folder</name> - </permission> <permission type='tuple'> <name>Copy or Move</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 e2de8ccef9..4c97be3bda 100644 --- a/bt5/erp5_banking_core/ModuleTemplateItem/foreign_check_module.xml +++ b/bt5/erp5_banking_core/ModuleTemplateItem/foreign_check_module.xml @@ -454,9 +454,6 @@ <name>Change proxy roles</name> <role>Manager</role> </permission> - <permission type='tuple'> - <name>Change user folder</name> - </permission> <permission type='tuple'> <name>Copy or Move</name> <role>Manager</role> diff --git a/bt5/erp5_banking_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_banking_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml index 1d1abe83bc..f42d1628b4 100644 --- a/bt5/erp5_banking_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml +++ b/bt5/erp5_banking_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml @@ -1,10 +1,4 @@ <allowed_content_type_list> - <portal_type id="Cash Container"> - <item>Container Line</item> - </portal_type> - <portal_type id="Cash Container Item"> - <item>Container Line</item> - </portal_type> <portal_type id="Cash Delivery Line"> <item>Cash Delivery Cell</item> </portal_type> @@ -14,9 +8,6 @@ <portal_type id="Checkbook"> <item>Check</item> </portal_type> - <portal_type id="Checkbook Model"> - <item>Checkbook Model Check Amount Variation</item> - </portal_type> <portal_type id="Checkbook Model Module"> <item>Checkbook Model</item> <item>Check Model</item> diff --git a/bt5/erp5_banking_core/PortalTypeBaseCategoryTemplateItem/base_category_list.xml b/bt5/erp5_banking_core/PortalTypeBaseCategoryTemplateItem/base_category_list.xml index a1ff5400ad..353be7751b 100644 --- a/bt5/erp5_banking_core/PortalTypeBaseCategoryTemplateItem/base_category_list.xml +++ b/bt5/erp5_banking_core/PortalTypeBaseCategoryTemplateItem/base_category_list.xml @@ -1,13 +1,7 @@ <base_category_list> - <portal_type id="Cash Container Item"> - <item>aggregate</item> - </portal_type> <portal_type id="Cash Delivery Cell"> <item>variation</item> </portal_type> - <portal_type id="Category"> - <item>vault_type</item> - </portal_type> <portal_type id="Checkbook"> <item>resource</item> <item>check_amount</item> diff --git a/bt5/erp5_banking_core/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml b/bt5/erp5_banking_core/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml deleted file mode 100644 index ebb5f7fb2e..0000000000 --- a/bt5/erp5_banking_core/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml +++ /dev/null @@ -1,8 +0,0 @@ -<hidden_content_type_list> - <portal_type id="Cash Container"> - <item>Container Line</item> - </portal_type> - <portal_type id="Cash Container Item"> - <item>Container Line</item> - </portal_type> -</hidden_content_type_list> \ No newline at end of file diff --git a/bt5/erp5_banking_core/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_banking_core/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml index 0676f54073..ee62c1bc3e 100644 --- a/bt5/erp5_banking_core/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml +++ b/bt5/erp5_banking_core/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -7,9 +7,17 @@ <type>Check</type> <workflow>edit_workflow, check_workflow</workflow> </chain> + <chain> + <type>Checkbook</type> + <workflow>edit_workflow</workflow> + </chain> + <chain> + <type>Checkbook Model</type> + <workflow>edit_workflow</workflow> + </chain> <chain> <type>Counter</type> - <workflow>counter_workflow, edit_workflow</workflow> + <workflow>edit_workflow, counter_workflow</workflow> </chain> <chain> <type>Counter Date</type> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_checkBaobabSourceAndDestination.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_checkBaobabSourceAndDestination.xml new file mode 100644 index 0000000000..335cf0b153 --- /dev/null +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_checkBaobabSourceAndDestination.xml @@ -0,0 +1,178 @@ +<?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> + <none/> + </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.DCWorkflow.DCWorkflow import ValidationFailed\n +from Products.ERP5Type.Message import Message\n +\n +object_to_check_list = [context]\n +object_to_check_list.extend(context.getMovementList())\n +\n +for object in object_to_check_list:\n + baobab_source = object.getBaobabSource()\n + baobab_destination = object.getBaobabDestination()\n +\n + for node_url in (baobab_source,baobab_destination):\n + if node_url is not None:\n + try:\n + node = context.portal_categories.restrictedTraverse(node_url)\n + except KeyError:\n + msg = Message(domain=\'ui\',message=\'Sorry, wrong source or destination\')\n + raise ValidationFailed, (msg,)\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/Base_checkBaobabSourceAndDestination</string> </value> + </item> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string>**kw</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>0</int> </value> + </item> + <item> + <key> <string>co_varnames</string> </key> + <value> + <tuple> + <string>kw</string> + <string>Products.DCWorkflow.DCWorkflow</string> + <string>ValidationFailed</string> + <string>Products.ERP5Type.Message</string> + <string>Message</string> + <string>context</string> + <string>object_to_check_list</string> + <string>_getattr_</string> + <string>_getiter_</string> + <string>object</string> + <string>baobab_source</string> + <string>baobab_destination</string> + <string>node_url</string> + <string>None</string> + <string>node</string> + <string>KeyError</string> + <string>msg</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>Base_checkBaobabSourceAndDestination</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/CashDelivery_generateCashDetailInputDialog.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDelivery_generateCashDetailInputDialog.xml index a5efbe4685..5e48efdb73 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDelivery_generateCashDetailInputDialog.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDelivery_generateCashDetailInputDialog.xml @@ -143,7 +143,7 @@ if listbox is None:\n # Get the currency cash objects for a given currency.\n currency = \'currency_module/%s\' % operation_currency\n result = context.portal_catalog(portal_type = currency_cash_portal_type)\n - currency_cash_list = [x.getObject() for x in result if x.getObject().getPriceCurrency() == currency]\n + currency_cash_list = [x.getObject() for x in result if x.getObject().getPriceCurrency() == currency and len(x.getObject().getVariationList())>0]\n #context.log(\'CashDelivery_generateCashDetailInputDialog\', \'currency_list = %r, operation_cur = %s\' % (currency_cash_list, operation_currency))\n \n # If only one variation is specified, we want to display a part of cash currencies which\n @@ -460,8 +460,8 @@ else :\n <string>$append0</string> <string>_getiter_</string> <string>x</string> - <string>currency_cash_list</string> <string>len</string> + <string>currency_cash_list</string> <string>new_currency_cash_list</string> <string>variation</string> <string>currency_cash</string> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox.xml index 512c7c1b62..3a2a89402e 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_cash_status.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_cash_status.xml index c035423812..820dea4373 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_cash_status.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_cash_status.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_cash_status</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column.xml new file mode 100644 index 0000000000..5b97612ce5 --- /dev/null +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column.xml @@ -0,0 +1,275 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.StandardFields</string> + <string>FloatField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>listbox_column</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + <item> + <key> <string>not_float</string> </key> + <value> <string>You did not enter a floating point number.</string> </value> + </item> + <item> + <key> <string>required_not_found</string> </key> + <value> <string>Input is required but no input given.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string>figure</string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string>0</string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>20</int> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string>align="right"</string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string>-1 234.5</string> </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Number</string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>0</int> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.TALESField</string> + <string>TALESMethod</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>string:-1 234.5 | preferences/getPreferredMoneyQuantityStyle</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column1.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column1.xml index e1078bd5f3..b53ef8d2f6 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column1.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column1.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_column1</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column10.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column10.xml index 5a214daf76..8fb3a4b0ee 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column10.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column10.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_column10</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column11.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column11.xml index e5169ce512..05bd34b203 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column11.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column11.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_column11</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column12.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column12.xml index 30b9e336f6..8d0e165a5e 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column12.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column12.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_column12</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column13.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column13.xml index 756fe99f8f..666972b1cf 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column13.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column13.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_column13</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column14.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column14.xml index 9ffaac31d0..60e5eafb1b 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column14.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column14.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_column14</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column15.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column15.xml index 13fae03f9b..1ec59e2367 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column15.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column15.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_column15</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column2.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column2.xml index 84e12c2884..e525b9024c 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column2.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column2.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_column2</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column3.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column3.xml index 7cc965d8e7..4cca678a5c 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column3.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column3.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_column3</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column4.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column4.xml index 1f51cc65ef..d34122c9af 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column4.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column4.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_column4</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column5.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column5.xml index 8e3564a352..4645142c35 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column5.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column5.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_column5</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column6.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column6.xml index 2098248055..0ce49aafb4 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column6.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column6.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_column6</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column7.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column7.xml index f6edb7398d..9e0b2b8a39 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column7.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column7.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_column7</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column8.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column8.xml index 4b53fc932d..93d001dfc9 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column8.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column8.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_column8</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column9.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column9.xml index fc6159bace..43795b530a 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column9.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_column9.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_column9</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_displayed_resource.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_displayed_resource.xml index 681b0a5b3b..3dfc3487bb 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_displayed_resource.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_displayed_resource.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_displayed_resource</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_emission_letter.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_emission_letter.xml index 9b2c05645c..cdefce59bf 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_emission_letter.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_emission_letter.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_emission_letter</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_number_line_to_add.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_number_line_to_add.xml index 4e6e23f201..c55d2f33db 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_number_line_to_add.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_number_line_to_add.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_number_line_to_add</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_price.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_price.xml index 17f5635ade..00e8fc6231 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_price.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_price.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_price</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_resource_id.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_resource_id.xml index 90a69961ed..a8e8850939 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_resource_id.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_resource_id.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_resource_id</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_variation.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_variation.xml index 2537a6a2a6..7d529884a5 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_variation.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/listbox_variation.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>listbox_variation</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_calculated_price.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_calculated_price.xml index fefebe5ea4..537d65b6a8 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_calculated_price.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_calculated_price.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>my_calculated_price</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_cash_status_list.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_cash_status_list.xml index 4d9a7ddb39..a8dad7552c 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_cash_status_list.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_cash_status_list.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>my_cash_status_list</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_emission_letter_list.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_emission_letter_list.xml index 5c6999eb92..02abb2c377 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_emission_letter_list.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_emission_letter_list.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>my_emission_letter_list</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_line_portal_type.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_line_portal_type.xml index 0eff13b547..f520de5f9c 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_line_portal_type.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_line_portal_type.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>my_line_portal_type</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_operation_currency.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_operation_currency.xml index e32da2b680..3d8b7868fd 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_operation_currency.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_operation_currency.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>my_operation_currency</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_other_parameter.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_other_parameter.xml index f0c5fefcd9..3919d504e6 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_other_parameter.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_other_parameter.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>my_other_parameter</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_variation_list.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_variation_list.xml index a6699fc60b..08169e7b37 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_variation_list.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_viewLineFastInputForm/my_variation_list.xml @@ -12,12 +12,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>my_variation_list</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml index 9b8a797c1b..47217aaaeb 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml @@ -100,6 +100,12 @@ inventory_kw[\'group_by_resource\'] = 1\n # add to get by portal type inventory\n if kw.has_key("portal_type"):\n inventory_kw[\'portal_type\'] = kw[\'portal_type\']\n +if kw.has_key("omit_input"):\n + inventory_kw[\'omit_input\'] = kw[\'omit_input\']\n +if kw.has_key("omit_output"):\n + inventory_kw[\'omit_output\'] = kw[\'omit_output\']\n +if kw.has_key("explanation_portal_type"):\n + inventory_kw[\'explanation_portal_type\'] = kw[\'explanation_portal_type\']\n \n if at_date is not None:\n inventory_kw[\'at_date\'] = at_date\n @@ -112,10 +118,10 @@ vault_inventory_list = context.portal_simulation.getCurrentInventoryList( node_c , ignore_variation=0\n ,**inventory_kw\n )\n -# context.log(\'CounterMOdule_getVaultTransactionList, sql src:\',context.portal_simulation.getCurrentInventoryList( node_category=vault\n -# , ignore_variation=0,src__=1\n -# ,**inventory_kw\n -# ))\n +context.log(\'CounterMOdule_getVaultTransactionList, sql src:\',context.portal_simulation.getCurrentInventoryList( node_category=vault\n + , ignore_variation=0,src__=1\n + ,**inventory_kw\n + ))\n \n #context.log(\'len(vault_inventory_list:\',len(vault_inventory_list))\n for vault_inventory in vault_inventory_list:\n diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml index 14da097be8..98632d2bae 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyPurchase_getQuantity.xml @@ -96,6 +96,12 @@ return quantity\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/CurrencyPurchase_getQuantity</string> </value> @@ -169,4 +175,25 @@ return quantity\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/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencySale_getQuantity.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencySale_getQuantity.xml index 7db16d0103..e0296e12a3 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencySale_getQuantity.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencySale_getQuantity.xml @@ -96,6 +96,12 @@ return quantity\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/CurrencySale_getQuantity</string> </value> @@ -169,4 +175,25 @@ return quantity\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/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ImportCsvToCategories.xml index 01bd810d62..d439b149fb 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 @@ -187,7 +187,7 @@ elif import_type == \'assign_codification\' :\n if e_list[0].startswith(\'site\'):\n acquired_vault_code = {\'banque_interne\':\'BI\',\'operations_diverses\':\'OD\',\'gros_paiement\':\'GP\',\'gros_versement\':\'GV\',\n \'guichet_1\':\'G1\',\'guichet_2\':\'G2\',\'guichet_3\':\'G3\'}\n - #context.log(\'category\',category.getPath())\n + context.log(\'category\',category.getPath())\n for sub_cat in category.getCategoryChildValueList(sort_id=\'path\'):\n print " %s" % sub_cat.getRelativeUrl()\n if sub_cat.getId() in acquired_vault_code.keys():\n @@ -216,7 +216,7 @@ elif import_type == \'create_subvaults\' :\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 + #context.log(\'e_list\', e_list)\n if len(e_list) in (2,3) :\n vault = lowerCase(e_list[0]) # ex : Vault_Type/Site/caveau/Auxiliaire\n subvault = upperCase(e_list[1]) # ex : Encaisse des Devises\n @@ -224,8 +224,9 @@ elif import_type == \'create_subvaults\' :\n if len(e_list)==3:\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 + #one_way_counter_list = (\'gros_paiement\',\'gros_versement\')\n + one_way_counter_list = ()\n + two_way_counter_list = (\'banque_interne\',\'operations_diverses\',\'gros_paiement\',\'gros_versement\')\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 @@ -310,7 +311,7 @@ elif import_type == \'create_subvaults\' :\n print \'XXXXXXXX is itself, not creating\', subvault_path\n pass\n else :\n - print \' creating\', subvault_path\n + print \' creating (case1) \', subvault_path\n if \'guichet\' in subvault_path:\n subcat_vault_type = \'%s/guichet\' %(\'/\'.join(vault_type.split(\'/\')[1:]),)\n elif \'transit\' in subvault_path.lower():\n @@ -319,11 +320,11 @@ elif import_type == \'create_subvaults\' :\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 + print \' creating (case2)\', subvault_path\n if \'guichet\' in subvault_path:\n subcat_vault_type = \'%s/guichet\' %(\'/\'.join(vault_type.split(\'/\')[1:]),)\n - #if \'devises\' in subvault_path.lower() and \'devises\' not in vault_type:\n - # subcat_vault_type = \'%s/devises\' %(\'/\'.join(vault_type.split(\'/\')[1:]),)\n + elif \'retire\' in subvault_path.lower():\n + subcat_vault_type = \'%s/retire\' %(\'/\'.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 diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow.xml index 6b7262255e..2a3852bbcd 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow.xml @@ -47,7 +47,11 @@ <item> <key> <string>permissions</string> </key> <value> - <tuple/> + <tuple> + <string>Modify portal content</string> + <string>Access contents information</string> + <string>View</string> + </tuple> </value> </item> <item> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/confirmed.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/confirmed.xml index 38156bd09b..e7db7835c8 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/confirmed.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/confirmed.xml @@ -32,6 +32,12 @@ <key> <string>id</string> </key> <value> <string>confirmed</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>Issued (Check)</string> </value> @@ -56,4 +62,59 @@ </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>Assignee</string> + <string>Assignor</string> + <string>Auditor</string> + <string>Manager</string> + <string>Owner</string> + </tuple> + </value> + </item> + <item> + <key> <string>Modify portal content</string> </key> + <value> + <tuple> + <string>Assignor</string> + <string>Manager</string> + </tuple> + </value> + </item> + <item> + <key> <string>View</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Auditor</string> + <string>Manager</string> + <string>Owner</string> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/draft.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/draft.xml index 7ee714f538..7b97f5fa9b 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/draft.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/draft.xml @@ -81,25 +81,30 @@ <item> <key> <string>Access contents information</string> </key> <value> - <list> + <tuple> + <string>Assignee</string> <string>Manager</string> - </list> + <string>Owner</string> + </tuple> </value> </item> <item> <key> <string>Modify portal content</string> </key> <value> - <list> + <tuple> <string>Manager</string> - </list> + <string>Owner</string> + </tuple> </value> </item> <item> <key> <string>View</string> </key> <value> - <list> + <tuple> + <string>Assignee</string> <string>Manager</string> - </list> + <string>Owner</string> + </tuple> </value> </item> </dictionary> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/cancel.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/cancel.xml index a81a2931fb..d0eb27a27e 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/cancel.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/cancel.xml @@ -92,6 +92,7 @@ <string>Manager</string> <string>Assignee</string> <string>DestinationAssignee</string> + <string>Assignor</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/cancel_action.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/cancel_action.xml index df9a358808..a86d96a101 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/cancel_action.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/cancel_action.xml @@ -92,6 +92,7 @@ <string>Manager</string> <string>Assignee</string> <string>DestinationAssignee</string> + <string>Assignor</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/deliver.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/deliver.xml index 647823c412..3fb99b283a 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/deliver.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/deliver.xml @@ -90,6 +90,7 @@ <value> <tuple> <string>Manager</string> + <string>Assignee</string> <string>DestinationAssignor</string> <string>DestinationAssignee</string> </tuple> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/deliver_action.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/deliver_action.xml index 953c308233..517948902a 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/deliver_action.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/deliver_action.xml @@ -90,6 +90,7 @@ <value> <tuple> <string>Manager</string> + <string>Assignee</string> <string>DestinationAssignor</string> <string>DestinationAssignee</string> </tuple> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/scripts.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/scripts.xml index 79efb24bf0..01ba35bf25 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/scripts.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/scripts.xml @@ -30,12 +30,6 @@ <tuple/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>scripts</string> </value> 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 1aa756fe71..83f97af3d8 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 @@ -86,8 +86,6 @@ while True:\n current_date = transaction.getStartDate()\n counter_list = [x.getObject() for x in context.portal_catalog(portal_type="Counter", simulation_state = [\'open\', \'closing\'], site_uid = site.getUid())]\n \n -context.log("Close Accounting Date", "current_date = %s, counter list = %s" %(current_date, counter_list))\n -\n for counter in counter_list:\n # close the counter, this will cancel not finished operations automatically\n if counter.getSimulationState() == \'open\':\n @@ -113,12 +111,6 @@ for counter in counter_list:\n <key> <string>_filepath</string> </key> <value> <string>Script (Python):/baobab/portal_workflow/counter_date_workflow/scripts/closeAllCounter</string> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_params</string> </key> <value> <string>state_change, *args, **kw</string> </value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/scripts/openAllCounter.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/scripts/openAllCounter.xml index d47ffcffac..dfcd22ebfc 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/scripts/openAllCounter.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/scripts/openAllCounter.xml @@ -92,12 +92,6 @@ for line in listbox:\n <key> <string>_filepath</string> </key> <value> <string>Script (Python):/baobab/portal_workflow/counter_date_workflow/scripts/openAllCounter</string> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_params</string> </key> <value> <string>state_change, *args, **kw</string> </value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states.xml index 17ebd27e51..d6c2d2d922 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states.xml @@ -30,12 +30,6 @@ <tuple/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>states</string> </value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/closed.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/closed.xml index 21217f5c54..80474a417b 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/closed.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/closed.xml @@ -18,12 +18,6 @@ <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>description</string> </key> <value> <string>The date is closed and balanced</string> </value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/draft.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/draft.xml index da503c7234..10a1a28bfe 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/draft.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/draft.xml @@ -18,12 +18,6 @@ <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>description</string> </key> <value> <string></string> </value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/open.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/open.xml index 6b6da3bea6..6ff3f352dd 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/open.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/states/open.xml @@ -18,12 +18,6 @@ <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>description</string> </key> <value> <string>The date is open to customers</string> </value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/transitions.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/transitions.xml index 65344191cd..3763e3df95 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/transitions.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/transitions.xml @@ -30,12 +30,6 @@ <tuple/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>transitions</string> </value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/transitions/close.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/transitions/close.xml index 8b6a1909fa..c42d8d102c 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/transitions/close.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/transitions/close.xml @@ -18,12 +18,6 @@ <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> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/transitions/close_action.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/transitions/close_action.xml index ae5012074d..0f28b12dab 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/transitions/close_action.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/transitions/close_action.xml @@ -18,12 +18,6 @@ <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> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/transitions/open.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/transitions/open.xml index 908643feca..083300b83d 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/transitions/open.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/transitions/open.xml @@ -18,12 +18,6 @@ <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> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/transitions/open_action.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/transitions/open_action.xml index ade5860209..2d99a9ff6e 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/transitions/open_action.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/transitions/open_action.xml @@ -18,12 +18,6 @@ <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> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/variables.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/variables.xml index 52b80e504e..07046d72fe 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/variables.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/variables.xml @@ -30,12 +30,6 @@ <tuple/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>variables</string> </value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/variables/action.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/variables/action.xml index ace61a9a8e..dd344a268a 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/variables/action.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/variables/action.xml @@ -18,12 +18,6 @@ <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>default_expr</string> </key> <value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/worklists.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/worklists.xml index 69a00bcd3b..f4c2789633 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/worklists.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/worklists.xml @@ -24,12 +24,6 @@ <dictionary/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>worklists</string> </value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts.xml index 79efb24bf0..01ba35bf25 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts.xml @@ -30,12 +30,6 @@ <tuple/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>scripts</string> </value> 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 786bb7d1da..b614204f8a 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 @@ -114,12 +114,6 @@ for operation in operation_list_object:\n <key> <string>_filepath</string> </key> <value> <string>Script (Python):/baobab/portal_workflow/counter_workflow/scripts/cancelRemainingOperation</string> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_params</string> </key> <value> <string>state_change, *args, **kw</string> </value> 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 faca843dfa..2f7ff1db84 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 @@ -101,12 +101,6 @@ if len(date_list) == 0:\n <key> <string>_filepath</string> </key> <value> <string>Script (Python):/baobab/portal_workflow/counter_workflow/scripts/checkDateOpened</string> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_params</string> </key> <value> <string>state_change, *args, **kw</string> </value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states.xml index 17ebd27e51..d6c2d2d922 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states.xml @@ -30,12 +30,6 @@ <tuple/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>states</string> </value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/closed.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/closed.xml index 7951fd407c..6683dc8c68 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/closed.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/closed.xml @@ -18,12 +18,6 @@ <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>description</string> </key> <value> <string>The counter is closed and balanced</string> </value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/closing.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/closing.xml index 896452fc48..995079adb3 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/closing.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/closing.xml @@ -18,12 +18,6 @@ <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>description</string> </key> <value> <string>The counter is now closed to customers but balance operations must still be performed</string> </value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/open.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/open.xml index eb3d3915a5..0c96f808e0 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/open.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/open.xml @@ -18,12 +18,6 @@ <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>description</string> </key> <value> <string>The counter is open to customers</string> </value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/paused.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/paused.xml index ddd260a6e4..c3a0b781c3 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/paused.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/states/paused.xml @@ -18,12 +18,6 @@ <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>description</string> </key> <value> <string></string> </value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions.xml index 65344191cd..3763e3df95 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions.xml @@ -30,12 +30,6 @@ <tuple/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>transitions</string> </value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/close.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/close.xml index 3f8e06e33c..2108039003 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/close.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/close.xml @@ -18,12 +18,6 @@ <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> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/close_action.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/close_action.xml index f5c451148f..9a80424bea 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/close_action.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/close_action.xml @@ -18,12 +18,6 @@ <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> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/dispose.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/dispose.xml index acd485bf13..2a68d1e56b 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/dispose.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/dispose.xml @@ -18,12 +18,6 @@ <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> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/dispose_action.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/dispose_action.xml index 0ea8b6092f..b99a5dd4db 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/dispose_action.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/dispose_action.xml @@ -18,12 +18,6 @@ <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> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/open.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/open.xml index 908643feca..083300b83d 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/open.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/open.xml @@ -18,12 +18,6 @@ <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> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/open_action.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/open_action.xml index a2c68acf5b..6fe2ac3cdf 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/open_action.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/open_action.xml @@ -18,12 +18,6 @@ <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> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/pause.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/pause.xml index 500b2f8fb2..0d3d33d5fc 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/pause.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/pause.xml @@ -18,12 +18,6 @@ <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> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/pause_action.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/pause_action.xml index 5147a47795..027a9dd5a3 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/pause_action.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/transitions/pause_action.xml @@ -18,12 +18,6 @@ <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> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/variables.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/variables.xml index 52b80e504e..07046d72fe 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/variables.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/variables.xml @@ -30,12 +30,6 @@ <tuple/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>variables</string> </value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/variables/action.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/variables/action.xml index ace61a9a8e..dd344a268a 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/variables/action.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/variables/action.xml @@ -18,12 +18,6 @@ <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>default_expr</string> </key> <value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/worklists.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/worklists.xml index 69a00bcd3b..f4c2789633 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/worklists.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/worklists.xml @@ -24,12 +24,6 @@ <dictionary/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>id</string> </key> <value> <string>worklists</string> </value> diff --git a/bt5/erp5_banking_core/bt/change_log b/bt5/erp5_banking_core/bt/change_log index 22b6df4d0b..8aeb298232 100644 --- a/bt5/erp5_banking_core/bt/change_log +++ b/bt5/erp5_banking_core/bt/change_log @@ -1,3 +1,6 @@ +2006-08-11 aurel +* improve view for counter module inventory report + 2006-08-9 aurel * fix script that check counter is opened and comment useless log to prevent security problem diff --git a/bt5/erp5_banking_core/bt/template_action_path_list b/bt5/erp5_banking_core/bt/template_action_path_list index 7191f4e11b..e01ccac3bd 100644 --- a/bt5/erp5_banking_core/bt/template_action_path_list +++ b/bt5/erp5_banking_core/bt/template_action_path_list @@ -5,10 +5,6 @@ Banking Operation Line | view Banknote | history Banknote | metadata Banknote | view -Cash Container Item | metadata -Cash Container Item | view -Cash Container | metadata -Cash Container | view Cash Delivery Cell | metadata Cash Delivery Cell | view Cash Delivery Line | metadata @@ -58,13 +54,7 @@ Counter Date | metadata Counter Date | view Counter Module | list_ui Counter Module | sort_on -Counter Module | vaul_inventory -Counter Module | vaul_situation -Counter Module | vault_classification_result -Counter Module | vault_currency_situation -Counter Module | vault_extern_situation Counter Module | vault_report -Counter Module | vault_to_sort_situation Counter Module | view Counter | history Counter | metadata diff --git a/bt5/erp5_banking_core/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_banking_core/bt/template_portal_type_allowed_content_type_list index 841959962c..49965e1c6f 100644 --- a/bt5/erp5_banking_core/bt/template_portal_type_allowed_content_type_list +++ b/bt5/erp5_banking_core/bt/template_portal_type_allowed_content_type_list @@ -1,10 +1,7 @@ -Cash Container Item | Container Line -Cash Container | Container Line Cash Delivery Line | Cash Delivery Cell Check Module | Check Checkbook Model Module | Check Model Checkbook Model Module | Checkbook Model -Checkbook Model | Checkbook Model Check Amount Variation Checkbook Module | Checkbook Checkbook | Check Counter Date Module | Counter Date diff --git a/bt5/erp5_banking_core/bt/template_portal_type_base_category_list b/bt5/erp5_banking_core/bt/template_portal_type_base_category_list index cb56156662..2bdea2021b 100644 --- a/bt5/erp5_banking_core/bt/template_portal_type_base_category_list +++ b/bt5/erp5_banking_core/bt/template_portal_type_base_category_list @@ -1,6 +1,4 @@ -Cash Container Item | aggregate Cash Delivery Cell | variation -Category | vault_type Checkbook | check_amount Checkbook | resource Container Cell | cash_status diff --git a/bt5/erp5_banking_core/bt/template_portal_type_hidden_content_type_list b/bt5/erp5_banking_core/bt/template_portal_type_hidden_content_type_list index fc194fc109..e69de29bb2 100644 --- a/bt5/erp5_banking_core/bt/template_portal_type_hidden_content_type_list +++ b/bt5/erp5_banking_core/bt/template_portal_type_hidden_content_type_list @@ -1,2 +0,0 @@ -Cash Container Item | Container Line -Cash Container | Container Line \ No newline at end of file diff --git a/bt5/erp5_banking_core/bt/template_portal_type_workflow_chain_list b/bt5/erp5_banking_core/bt/template_portal_type_workflow_chain_list index 4470e13a60..f1cef8f03f 100644 --- a/bt5/erp5_banking_core/bt/template_portal_type_workflow_chain_list +++ b/bt5/erp5_banking_core/bt/template_portal_type_workflow_chain_list @@ -1,6 +1,8 @@ Category | edit_workflow Check | check_workflow Check | edit_workflow +Checkbook Model | edit_workflow +Checkbook | edit_workflow Counter Date | counter_date_workflow Counter Date | edit_workflow Counter | counter_workflow -- 2.30.9