diff --git a/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/emission_letter.xml b/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/emission_letter.xml index 0c74dea7e9b7f8b238bcf0d2d94233f8963a5939..359066aca0235dcafcb891355107eacd8e6adb3b 100644 --- a/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/emission_letter.xml +++ b/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/emission_letter.xml @@ -53,6 +53,10 @@ <key> <string>id</string> </key> <value> <string>emission_letter</string> </value> </item> + <item> + <key> <string>last_id</string> </key> + <value> <string>1</string> </value> + </item> <item> <key> <string>title</string> </key> <value> diff --git a/bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Accounting%20Date.xml b/bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Accounting%20Date.xml index 21a49b2b0d31f62c147768d6056847c093a35686..6691b9bc1b764c25a944487dac0c5d00d9f3a586 100644 --- a/bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Accounting%20Date.xml +++ b/bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Accounting%20Date.xml @@ -84,7 +84,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string>Counter Date defines a given day common to all counter operations</string> </value> + <value> <string>Accouting Date defines a day on which accounting operations can happen.</string> </value> </item> <item> <key> <string>factory</string> </key> @@ -112,7 +112,7 @@ </item> <item> <key> <string>init_script</string> </key> - <value> <string>CounterDate_init</string> </value> + <value> <string>AccountingDate_init</string> </value> </item> <item> <key> <string>permission</string> </key> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModule_viewCheckbookList/listbox.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModule_viewCheckbookList/listbox.xml index 72fcb2404495036339150b846c3584b7cff0c4f8..fe2ef1cf74898fc5b08580149f49c2bdb4312a32 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModule_viewCheckbookList/listbox.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModule_viewCheckbookList/listbox.xml @@ -360,6 +360,10 @@ <string>description</string> <string>Description</string> </tuple> + <tuple> + <string>translated_validation_state_title</string> + <string>State</string> + </tuple> </list> </value> </item> 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 0c7543155e414531786b539381f48772cd79e1c0..e5e4e662d5fa1cbdbd89e3bcea8a2258e10f200e 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 @@ -65,11 +65,16 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string># This script returns a list of resources that we can find in a particular stock point.\n + <value> <string encoding="cdata"><![CDATA[ + +# This script returns a list of resources that we can find in a particular stock point.\n # - vault : the stock we are intested in\n # - at_date : give the stock for a particular date\n # - from_date : usefull with at date in order to know the sum of input and output\n # between two dates\n +# - excluded_variation_list : Allow to do report with some types of ressources, like\n +# [\'cash_status/valid\', \'cash_status/new_not_emitted\']\n +#\n \n from Products.ERP5Type.Document import newTempBase\n \n @@ -95,6 +100,7 @@ vault_inventory_dict = {}\n portal = context.getPortalObject()\n \n \n +\n vault_url_list = vault\n if same_type(vault, \'a\'):\n vault_url_list = [vault]\n @@ -102,7 +108,24 @@ if same_type(vault, \'a\'):\n for vault_url in vault_url_list:\n vault_dict[vault_url] = 1\n vault_inventory_dict[vault_url] = {}\n -\n + \n +def cartesianProduct(list_of_list):\n + """\n + Be carefull : one mathematical property of cartesian product is that\n + when you do a cartesian products of a set and an empty set, the result\n + is an empty set.\n + """\n + if len(list_of_list) == 0:\n + return [[]]\n + result = []\n + append = result.append\n + head = list_of_list[0]\n + tail = list_of_list[1:]\n + product = cartesianProduct(tail)\n + for v in head:\n + for p in product:\n + append([v] + p)\n + return result\n \n total_inventory_list = []\n inventory_kw = {}\n @@ -126,12 +149,27 @@ if kw.has_key("explanation_uid"):\n kw_has_cash_status = kw.has_key("cash_status")\n kw_has_emission_letter = kw.has_key("emission_letter")\n if kw_has_cash_status or kw_has_emission_letter:\n - variation_text_list = [\'%\']\n + cash_status_list = [None]\n + emission_letter_list = [None]\n if kw_has_cash_status:\n - variation_text_list.append("cash_status/%s%%" % kw[\'cash_status\'])\n + cash_status_parameter = kw[\'cash_status\']\n + if same_type(cash_status_parameter, \'a\'):\n + cash_status_parameter = [cash_status_parameter]\n + cash_status_list = ["cash_status/%s%%" % x for x in cash_status_parameter]\n if kw_has_emission_letter:\n - variation_text_list.append("emission_letter/%s%%" % kw[\'emission_letter\'])\n - inventory_kw[\'variation_text\'] = \'\'.join(variation_text_list)\n + emission_letter_parameter = kw[\'emission_letter\']\n + if same_type(emission_letter_parameter, \'a\'):\n + emission_letter_parameter = [emission_letter_parameter]\n + emission_letter_list = ["emission_letter/%s%%" % x for x in emission_letter_parameter]\n + full_variation_list_of_list = [cash_status_list, emission_letter_list]\n + inventory_kw[\'variation_text\'] = []\n + for variation_list in cartesianProduct(full_variation_list_of_list):\n + variation_text_list = [\'%\']\n + for variation in variation_list:\n + if variation is not None:\n + variation_text_list.append(variation)\n + variation_text = \'\'.join(variation_text_list)\n + inventory_kw[\'variation_text\'].append(variation_text)\n \n if at_date is not None:\n # XXX this make sure we look at the end of the day\n @@ -184,10 +222,19 @@ for vault_inventory in vault_inventory_list:\n continue\n #context.log(\'vault_inventory total_quantity\',vault_inventory.total_quantity)\n #context.log(\'vault_inventory total_price\',vault_inventory.total_price)\n - resource = (vault_inventory.resource_relative_url, vault_inventory.variation_text or \'\')\n + variation_text = vault_inventory.variation_text or \'\'\n + must_continue = 0\n + if excluded_variation_list is not None:\n + for excluded_variation in excluded_variation_list:\n + if variation_text.find(excluded_variation)>=0:\n + must_continue = 1\n + break\n + if must_continue:\n + continue\n + resource = (vault_inventory.resource_relative_url, variation_text)\n if vault_report_type==\'history\':\n #resource = (vault_inventory.resource_relative_url, vault_inventory.variation_text or \'\',vault_inventory.stock_uid)\n - resource = (vault_inventory.resource_relative_url, vault_inventory.variation_text or \'\',vault_inventory.path)\n + resource = (vault_inventory.resource_relative_url, variation_text, vault_inventory.path)\n if not vault_inventory_dict[node_relative_url].has_key(resource):\n total_quantity = vault_inventory.total_quantity\n if total_quantity is None:\n @@ -275,6 +322,7 @@ for resource in resource_dict.keys():\n total_price = round(total_price / banknote_quantity_divisor,0)\n tmp_dict.update({\'total_quantity\' : total_quantity,\n \'total_price\' : total_price,})\n + tmp_dict.update({\'vault\' : vault})\n if vault_report_type==\'history\':\n tmp_dict.update({\'date\':resource_in_vault[\'date\']})\n general_total_price += resource_in_vault[\'total_price\']\n @@ -291,7 +339,9 @@ return total_inventory_list\n \n \n return repr([x for x in total_inventory_list])\n -</string> </value> + + +]]></string> </value> </item> <item> <key> <string>_code</string> </key> @@ -313,7 +363,15 @@ return repr([x for x in total_inventory_list])\n </item> <item> <key> <string>_params</string> </key> - <value> <string>vault=None,at_date=None,from_date=None,vault_report_type=None,column_names=0,resource_portal_type=(\'Banknote\',\'Coin\'), only_positive=0, banknote_quantity_divisor=None, summarise=False, **kw</string> </value> + <value> <string>vault=None,at_date=None,from_date=None,vault_report_type=None,column_names=0,resource_portal_type=(\'Banknote\',\'Coin\'), only_positive=0, banknote_quantity_divisor=None, summarise=False, excluded_variation_list=None,**kw</string> </value> + </item> + <item> + <key> <string>_proxy_roles</string> </key> + <value> + <tuple> + <string>Manager</string> + </tuple> + </value> </item> <item> <key> <string>errors</string> </key> @@ -333,7 +391,7 @@ return repr([x for x in total_inventory_list])\n <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>9</int> </value> + <value> <int>10</int> </value> </item> <item> <key> <string>co_varnames</string> </key> @@ -348,6 +406,7 @@ return repr([x for x in total_inventory_list])\n <string>only_positive</string> <string>banknote_quantity_divisor</string> <string>summarise</string> + <string>excluded_variation_list</string> <string>kw</string> <string>Products.ERP5Type.Document</string> <string>newTempBase</string> @@ -366,13 +425,25 @@ return repr([x for x in total_inventory_list])\n <string>_getiter_</string> <string>vault_url</string> <string>_write_</string> + <string>cartesianProduct</string> <string>total_inventory_list</string> <string>inventory_kw</string> <string>_getitem_</string> <string>len</string> <string>kw_has_cash_status</string> <string>kw_has_emission_letter</string> + <string>cash_status_list</string> + <string>emission_letter_list</string> + <string>cash_status_parameter</string> + <string>append</string> + <string>$append0</string> + <string>x</string> + <string>emission_letter_parameter</string> + <string>full_variation_list_of_list</string> + <string>variation_list</string> <string>variation_text_list</string> + <string>variation</string> + <string>variation_text</string> <string>column_list</string> <string>_apply_</string> <string>vault_inventory_list</string> @@ -382,11 +453,11 @@ return repr([x for x in total_inventory_list])\n <string>_inplacevar_</string> <string>abs</string> <string>node_relative_url</string> + <string>must_continue</string> + <string>excluded_variation</string> <string>resource</string> <string>i</string> - <string>variation_text</string> <string>tmp_dict</string> - <string>variation</string> <string>resource_value</string> <string>current_resource_portal_type</string> <string>movement</string> @@ -399,9 +470,6 @@ return repr([x for x in total_inventory_list])\n <string>round</string> <string>sort_base_price</string> <string>repr</string> - <string>append</string> - <string>$append0</string> - <string>x</string> </tuple> </value> </item> @@ -426,6 +494,7 @@ return repr([x for x in total_inventory_list])\n <int>0</int> <none/> <int>0</int> + <none/> </tuple> </value> </item> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog.xml index 655957b230be0c622241bbe7de75856f03dedc3f..ab99b28f4c30f8c201976eb2fd5adc03f4309d4e 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog.xml @@ -74,7 +74,7 @@ <value> <dictionary> <item> - <key> <string>hidden</string> </key> + <key> <string>hidden</string> </key> <value> <list/> </value> @@ -85,6 +85,8 @@ <list> <string>my_vault</string> <string>my_vault_report_type</string> + <string>my_from_date</string> + <string>my_to_date</string> </list> </value> </item> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/my_from_date.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog/my_from_date.xml similarity index 100% rename from bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/my_from_date.xml rename to bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog/my_from_date.xml diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/my_to_date.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog/my_to_date.xml similarity index 100% rename from bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/my_to_date.xml rename to bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog/my_to_date.xml diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog/my_vault.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog/my_vault.xml index 61abd7b7a2426bb73a58aed029f38a2121cfcc62..e2fd9ddc93cb7df58a8bcb23dcd04b86661041eb 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog/my_vault.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog/my_vault.xml @@ -282,11 +282,8 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.TALESField</string> - <string>TALESMethod</string> - </tuple> - <none/> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport.xml index a0378753cc1d79208d1848d1be71611b4f4aad94..5bb29f744aaa0b1c47f5dbf65373bcbcdb8300c3 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport.xml @@ -50,7 +50,7 @@ </item> <item> <key> <string>action</string> </key> - <value> <string>CounterModule_viewVaultReport</string> </value> + <value> <string></string> </value> </item> <item> <key> <string>encoding</string> </key> @@ -64,7 +64,7 @@ <key> <string>group_list</string> </key> <value> <list> - <string>left</string> + <string>bottom</string> <string>hidden</string> </list> </value> @@ -74,19 +74,19 @@ <value> <dictionary> <item> - <key> <string>hidden</string> </key> + <key> <string>bottom</string> </key> <value> - <list/> + <list> + <string>listbox</string> + </list> </value> </item> <item> - <key> <string>left</string> </key> + <key> <string>hidden</string> </key> <value> <list> - <string>my_vault</string> - <string>my_vault_report_type</string> - <string>my_from_date</string> - <string>my_to_date</string> + <string>listbox_total_price</string> + <string>listbox_total_quantity</string> </list> </value> </item> @@ -103,11 +103,11 @@ </item> <item> <key> <string>name</string> </key> - <value> <string>CounterModule_viewReportDialog</string> </value> + <value> <string>CounterModule_viewVaultReport</string> </value> </item> <item> <key> <string>pt</string> </key> - <value> <string>form_dialog</string> </value> + <value> <string>form_list</string> </value> </item> <item> <key> <string>row_length</string> </key> @@ -119,7 +119,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Report</string> </value> + <value> <string>Vault Report</string> </value> </item> <item> <key> <string>unicode_mode</string> </key> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/listbox.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/listbox.xml index d5dc780097b45f5e1ba07f9fb82da0378d4be1ee..1e464eefa17e1df638f0efcb968ce5db84b0be65 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/listbox.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/listbox.xml @@ -38,10 +38,6 @@ <key> <string>all_columns</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>all_editable_columns</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>alternate_name</string> </key> <value> <string></string> </value> @@ -58,10 +54,6 @@ <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>default_params</string> </key> <value> <string></string> </value> @@ -118,6 +110,10 @@ <key> <string>meta_types</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>page_template</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>portal_types</string> </key> <value> <string></string> </value> @@ -181,10 +177,6 @@ <key> <string>all_columns</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>all_editable_columns</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>alternate_name</string> </key> <value> <string></string> </value> @@ -203,10 +195,6 @@ <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>default_params</string> </key> <value> <string></string> </value> @@ -263,6 +251,10 @@ <key> <string>meta_types</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>page_template</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>portal_types</string> </key> <value> <string></string> </value> @@ -554,11 +546,8 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.TALESField</string> - <string>TALESMethod</string> - </tuple> - <none/> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + <tuple/> </tuple> </pickle> <pickle> @@ -581,7 +570,7 @@ <dictionary> <item> <key> <string>method_name</string> </key> - <value> <string>CounterModule_getVaultInventoryList</string> </value> + <value> <unicode>CounterModule_getVaultInventoryList</unicode> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/listbox_total_price.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/listbox_total_price.xml index 4a3f928cbc92c5a364dae21d0e5d89674400a5a7..3f392a789551eada71d6d3e37c0b1d9e84c4c027 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/listbox_total_price.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/listbox_total_price.xml @@ -259,11 +259,8 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.TALESField</string> - <string>TALESMethod</string> - </tuple> - <none/> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/listbox_total_quantity.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/listbox_total_quantity.xml index 93ef03567cf859682b6b53e4624ea91187f30d76..dead78cc978344457d8f5ba5962eeee46520508a 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/listbox_total_quantity.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/listbox_total_quantity.xml @@ -259,11 +259,8 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.TALESField</string> - <string>TALESMethod</string> - </tuple> - <none/> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/my_vault.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/my_vault.xml deleted file mode 100644 index e2fd9ddc93cb7df58a8bcb23dcd04b86661041eb..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/my_vault.xml +++ /dev/null @@ -1,298 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="ListField" module="Products.Formulator.StandardFields"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>my_vault</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>required_not_found</string> </key> - <value> <string>Input is required but no input given.</string> </value> - </item> - <item> - <key> <string>unknown_selection</string> </key> - <value> <string>You selected an item that was not in the list.</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>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>extra_item</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>first_item</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>items</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>size</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>unicode</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>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>extra_item</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>first_item</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>items</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>size</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>unicode</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></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>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></string> </value> - </item> - <item> - <key> <string>extra_item</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>first_item</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>items</string> </key> - <value> - <list> - <tuple> - <string>a</string> - <string>a</string> - </tuple> - <tuple> - <string>z</string> - <string>z</string> - </tuple> - </list> - </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>size</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Vault</string> </value> - </item> - <item> - <key> <string>unicode</string> </key> - <value> <int>0</int> </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> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python: here.Delivery_getVaultItemList(vault_type=\'site\', all=1,leaf_node=0)</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/my_vault_report_type.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/my_vault_report_type.xml deleted file mode 100644 index 750a4a859a130d3f4e8660ad39fcf4a316ffca95..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/my_vault_report_type.xml +++ /dev/null @@ -1,280 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="ListField" module="Products.Formulator.StandardFields"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>my_vault_report_type</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>required_not_found</string> </key> - <value> <string>Input is required but no input given.</string> </value> - </item> - <item> - <key> <string>unknown_selection</string> </key> - <value> <string>You selected an item that was not in the list.</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>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>extra_item</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>first_item</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>items</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>size</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>unicode</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>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>extra_item</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>first_item</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>items</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>size</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>unicode</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></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>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></string> </value> - </item> - <item> - <key> <string>extra_item</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>first_item</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>items</string> </key> - <value> - <list> - <tuple> - <string>history</string> - <string>history</string> - </tuple> - <tuple> - <string>inventory</string> - <string>inventory</string> - </tuple> - </list> - </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>size</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Report Type</string> </value> - </item> - <item> - <key> <string>unicode</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <int>0</int> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/scripts.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/scripts.xml index 41c3b9019a4792624cd4162db5a860ba2c45605f..66683dde0451b4de3eeb20f0fe5c7af60083c8a8 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/scripts.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/scripts.xml @@ -27,12 +27,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/check_workflow/states.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states.xml index 26c46d417ebb740f3e43be05f81ccd1d970ff5ea..cd2db0fb0c7613eebbc6622ce8b6e45adb4dd062 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states.xml @@ -27,12 +27,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/check_workflow/states/archived.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/archived.xml index f68235c990f31cb6b2a631933c4f12e7b685a02e..fa6603de7241db3cd42daecb8e34304e16bedcb7 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/archived.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/archived.xml @@ -15,12 +15,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/check_workflow/states/cancelled.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/cancelled.xml index 78153eccd5171512de384d96fb688d321fce1ddb..a2e64ee7e3477eff4fac2fc31e2f6c1a9b0118c4 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/cancelled.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/cancelled.xml @@ -15,12 +15,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/check_workflow/states/confirmed.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/confirmed.xml index b931ca993447b65ac30a89071cbceb459638510e..7760855f6a6a69b412d0e3400a0d528052451d15 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 @@ -15,12 +15,6 @@ <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>description</string> </key> <value> <string></string> </value> @@ -51,6 +45,7 @@ <string>deliver_action</string> <string>stop</string> <string>stop_action</string> + <string>unconfirm</string> </tuple> </value> </item> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/deleted.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/deleted.xml index d5d6e014b8a88ca9b387db4611a820b70e55e3c5..3bd90275d5daa8dff5f403064333fc62ed2e2f51 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/deleted.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/deleted.xml @@ -15,12 +15,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/check_workflow/states/delivered.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/delivered.xml index 1092dcb1b5825015917011144f7f23e1f0a059ec..dbbbd84f731c2e021fef32e03a13a91464684b84 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/delivered.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/states/delivered.xml @@ -15,12 +15,6 @@ <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>description</string> </key> <value> <string>Possibility should be given through special script code to cancel payment (and before that, allow modifications)</string> </value> 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 fb659dc3137c1e6b2132dfb14592cb8e0d35c20c..64db2935b8dbdaa7d705d2f9457110c2ec70956b 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 @@ -15,12 +15,6 @@ <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>description</string> </key> <value> <string>Documents in draft state should never be accounted and should only be visible by their ownner</string> </value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions.xml index 7e4e3b01847c5d2b643995c092078077483d5969..61f19d835aad719dc95cedb6501029cfdf94a7ae 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions.xml @@ -27,12 +27,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/check_workflow/transitions/archive.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/archive.xml index f5744e5abc6952a35e2919ca4c2b10911020bc82..297dbcb0a70f37cea604bfc5d035e675a549f878 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/archive.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/archive.xml @@ -15,12 +15,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/check_workflow/transitions/cancel.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/cancel.xml index 2d1dad7d1782357fff4d0ab73bb27dd91e31b748..f8df1c46041efc3a35f4c75e2080000e5df453a5 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 @@ -15,12 +15,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/check_workflow/transitions/cancel_action.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/cancel_action.xml index 961df35593c47273e62f3e881ba43ce763566479..242bdcae4cb402c0c0318d302bf5b775288cfa8f 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 @@ -15,12 +15,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/check_workflow/transitions/confirm.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/confirm.xml index 0da24f1e5482d2a19cdba1f98cdc95172b00c63f..f0fffb32d759b689a50696010d11431115eae557 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/confirm.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/confirm.xml @@ -15,12 +15,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/check_workflow/transitions/confirm_action.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/confirm_action.xml index f797ee55a84468f1b91a44eebe6f66ae88bdbead..f4f46fa0fe3c5eafac74b23e427236a8a96f6562 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/confirm_action.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/confirm_action.xml @@ -15,12 +15,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/check_workflow/transitions/delete.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/delete.xml index 36728843084b70b58aa46c19b64112a0a9eef23a..80cd6128ec2a7c9e600524a364347039b1ba31a5 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/delete.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/delete.xml @@ -15,12 +15,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/check_workflow/transitions/delete_action.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/delete_action.xml index 8ec68627e82ac5e1661ed12604a73dd59a024041..e769a5d64ea2b0946fa850d2c84a0b6fb936df94 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/delete_action.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/delete_action.xml @@ -15,12 +15,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> @@ -73,11 +67,8 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> + <global name="Guard" module="Products.DCWorkflow.Guard"/> + <tuple/> </tuple> </pickle> <pickle> @@ -88,6 +79,7 @@ <tuple> <string>Manager</string> <string>Assignor</string> + <string>Assignee</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 7527dd7ee0715bdcd6201178e5de16e948a1bf57..e6b7225d0dc02a8c324d583e15d8a7949792a8c2 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 @@ -15,12 +15,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/check_workflow/transitions/deliver_action.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/deliver_action.xml index d55c4e3327ba3a2ae32aac1d6612877531f81225..355eb59b06a14c7357ba843e95585ab9e7b83778 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 @@ -15,12 +15,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/check_workflow/transitions/unconfirm.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/unconfirm.xml new file mode 100644 index 0000000000000000000000000000000000000000..adf286aa3ba501e7f92abd2db0b94f9a5cf9c7ad --- /dev/null +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/transitions/unconfirm.xml @@ -0,0 +1,67 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>actbox_category</string> </key> + <value> <string>workflow</string> </value> + </item> + <item> + <key> <string>actbox_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>after_script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>guard</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>unconfirm</string> </value> + </item> + <item> + <key> <string>new_state_id</string> </key> + <value> <string>draft</string> </value> + </item> + <item> + <key> <string>script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>trigger_type</string> </key> + <value> <int>2</int> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables.xml index 2b275991f8f1705aead8674311ea7d16355720d4..7d9ea0fae8df235f1290022d3cb37eaf4a947ade 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables.xml @@ -27,12 +27,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/check_workflow/variables/action.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/action.xml index 211f6e7302d7373275e1ba57b06e2842153b2677..b6947a99ad9810e16709a7dff741b823fafec419 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/action.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/action.xml @@ -15,12 +15,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/check_workflow/variables/actor.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/actor.xml index cfb3dd1b8693a3ae5147aa81b232f7164fab10bc..bc6db324fc537ceffa1143a6b175bbb6e2fed08e 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/actor.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/actor.xml @@ -15,12 +15,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/check_workflow/variables/comment.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/comment.xml index 5d4243e7fad8fdd93d06f8b72226ac143eaf65cb..636dd21ecd0ad68b1ac212ed0f4108f9ca364776 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/comment.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/comment.xml @@ -15,12 +15,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/check_workflow/variables/error_message.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/error_message.xml index ea1ffb9595cd294910d39a3a5c9f0a1b2acef916..08c6214231c363145a444b6d05712cdf6b9b870b 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/error_message.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/error_message.xml @@ -15,12 +15,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/check_workflow/variables/history.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/history.xml index 717ebffc4a7f55e59fa547d52cfa4ad42260cf4f..6270841fa025e40b642fa05a91912e62301549dc 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/history.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/history.xml @@ -15,12 +15,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/check_workflow/variables/portal_type.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/portal_type.xml index 92471fbf6c6deda7c81ec43e809d969ab5985bee..96414aee009b30ae6495d39f108064a5be1c0ac8 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/portal_type.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/portal_type.xml @@ -15,12 +15,6 @@ <none/> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>for_status</string> </key> <value> <string></string> </value> diff --git a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/simulation_assigned.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/simulation_assigned.xml index ead8ca730f2e0cb31e9ebb87f0e0fbd82861aa8d..c77f13959fca6c8ce0c9162cce3f1a5a67c9d83b 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/simulation_assigned.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/simulation_assigned.xml @@ -15,12 +15,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/check_workflow/variables/time.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/time.xml index 587bdc630c254066815db73772a4b104af9ef2e5..a8c1b7f62c4aa08f81156c457fd8d02cb96b2e06 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/time.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/time.xml @@ -15,12 +15,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/check_workflow/worklists.xml b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/worklists.xml index cee05b581386a13ae62b4ab50d0695469f72e159..609a885c76263f454a385fb66fa97995f5c7bdcd 100644 --- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/worklists.xml +++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/worklists.xml @@ -27,12 +27,6 @@ <tuple/> </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/revision b/bt5/erp5_banking_core/bt/revision index 53c731105c7803f053a072618b750de8b3a1189c..e6d11f621da97224a8d9b0a983eae255067af32a 100644 --- a/bt5/erp5_banking_core/bt/revision +++ b/bt5/erp5_banking_core/bt/revision @@ -1 +1 @@ -286 \ No newline at end of file +291 \ No newline at end of file