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 3f00643af7829a1a2a1fe90a10d9ea4deaea5c6c..2112cb9a9ffe77ed84547cda6c43987c211e081d 100644 --- a/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/vault_type.xml +++ b/bt5/erp5_banking_core/CategoryTemplateItem/portal_categories/vault_type.xml @@ -42,6 +42,22 @@ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> </value> </item> + <item> + <key> <string>acquisition_portal_type</string> </key> + <value> <string>python: []</string> </value> + </item> + <item> + <key> <string>category_type_list </string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>id</string> </key> <value> <string>vault_type</string> </value> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getCounterList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getCounterList.xml index adda26a22001b85b46f28f222c0b734a755c9585..266b2e1abc374c8c22be4ff37599fc4f3da7f014 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getCounterList.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getCounterList.xml @@ -69,16 +69,20 @@ <value> <string># return counter list for a given site and a given vault type\n \n if vault_type is None:\n - vault_type = (\'site/surface/banque_interne\', \'site/surface/gros_paiement\', \'site/surface/gros_versement\', \'site/surface/operations_diverses\')\n + vault_type = (\'site/surface/banque_interne\', \'site/surface/gros_paiement\', \'site/surface/gros_versement\', \'site/surface/operations_diverses\')\n \n \n vault_list = context.Delivery_getVaultItemList(vault_type=vault_type, strict_membership = 0, leaf_node=0, user_site=1, with_base=0)\n counter_dict = {}\n for vault in vault_list:\n - if len(vault[0].split("/")) == 4:\n - counter = \'/\'.join(vault[0].split("/")[:3])\n - if not counter_dict.has_key(counter):\n - counter_dict[counter] = \'/\'.join(vault[1].split("/")[:6])\n + if len(vault[0].split("/")) == 4:\n + counter = \'/\'.join(vault[0].split("/")[:3])\n + if not counter_dict.has_key(counter):\n + if not \'siege\' in vault[1]:\n + counter_dict[counter] = \'/\'.join(vault[1].split("/")[:6])\n + else:\n + counter_dict[counter] = \'/\'.join(vault[1].split("/")[:5])\n + \n \n list = counter_dict.items()\n list.sort()\n diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getPossibleUserAssignmentSiteList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getPossibleUserAssignmentSiteList.xml new file mode 100644 index 0000000000000000000000000000000000000000..bc54d77477bee517759663047150d59b0f6a540b --- /dev/null +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getPossibleUserAssignmentSiteList.xml @@ -0,0 +1,209 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.PythonScripts.PythonScript</string> + <string>PythonScript</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>Python_magic</string> </key> + <value> <string encoding="base64">bfINCg==</string> </value> + </item> + <item> + <key> <string>Script_magic</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_bind_names</string> </key> + <value> + <object> + <klass> + <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>_asgns</string> </key> + <value> + <dictionary> + <item> + <key> <string>name_container</string> </key> + <value> <string>container</string> </value> + </item> + <item> + <key> <string>name_context</string> </key> + <value> <string>context</string> </value> + </item> + <item> + <key> <string>name_m_self</string> </key> + <value> <string>script</string> </value> + </item> + <item> + <key> <string>name_subpath</string> </key> + <value> <string>traverse_subpath</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>_body</string> </key> + <value> <string># return site of the user and possible counter on wich user can be assigned\n +if context.getDestination() is None:\n + # must have an organisation defined to limit site diplayed\n + return [[\'\', \'\']]\n +\n +dest_site_title = context.getDestinationValue().getSiteTitle()\n +\n +site_list = context.Delivery_getVaultItemList(user_site=0, vault_type=("site", "site/surface/banque_interne/guichet", "site/surface/gros_paiement/guichet", "site/surface/gros_versement/guichet"), strict_membership=1, leaf_node=0)\n +site_dict = {}\n +for site in site_list:\n + site_split = site[0].split(\'/\')\n + if dest_site_title in site_split:\n + if len(site_split) == 4:\n + # case of counter\n + counter = "/".join(site_split[:-1])\n + if not site_dict.has_key(counter):\n + if not \'siege\' in site[1]:\n + site_dict[counter] = \'/\'.join(site[1].split("/")[:6])\n + else:\n + site_dict[counter] = \'/\'.join(site[1].split("/")[:5])\n + else:\n + site_dict[site[0]] = site[1]\n +\n +list = site_dict.items()\n +list.sort()\n +return list\n +</string> </value> + </item> + <item> + <key> <string>_code</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_dav_writelocks</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>_filepath</string> </key> + <value> <string>Script (Python):/baobab/portal_skins/erp5_banking_core/Baobab_getPossibleUserAssignmentSiteList</string> </value> + </item> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string></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>_getattr_</string> + <string>context</string> + <string>None</string> + <string>dest_site_title</string> + <string>site_list</string> + <string>site_dict</string> + <string>_getiter_</string> + <string>site</string> + <string>_getitem_</string> + <string>site_split</string> + <string>len</string> + <string>counter</string> + <string>_write_</string> + <string>list</string> + </tuple> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>func_defaults</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>Baobab_getPossibleUserAssignmentSiteList</string> </value> + </item> + <item> + <key> <string>warnings</string> </key> + <value> + <tuple/> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Persistence</string> + <string>PersistentMapping</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_container</string> </key> + <value> + <dictionary/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getResourceVintageList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getResourceVintageList.xml index f2b8a2a18a4d4fcdfc377d3104968922ee050cb0..dbfd687615307c999eaec07c149eecaa2bcf67fc 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getResourceVintageList.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getResourceVintageList.xml @@ -70,9 +70,9 @@ \n def getResourceVintageList(banknote=0, coin=0):\n variation_list = {}\n - if banknote:\n + if banknote and not coin:\n portal_type_list = ["Banknote",]\n - elif coin:\n + elif coin and not banknote:\n portal_type_list = ["Coin",]\n else:\n portal_type_list = ["Banknote", "Coin"]\n diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/mapped_value_property_list.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/mapped_value_property_list.xml deleted file mode 100644 index d622ff0d4043fe235f092fbc52222fb81e953ba6..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/mapped_value_property_list.xml +++ /dev/null @@ -1,313 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>LinesField</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>mapped_value_property_list</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>line_too_long</string> </key> - <value> <string>A line was too long.</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>too_long</string> </key> - <value> <string>You entered too many characters.</string> </value> - </item> - <item> - <key> <string>too_many_lines</string> </key> - <value> <string>You entered too many lines.</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>height</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_length</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_linelength</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_lines</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>unicode</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>view_separator</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>width</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>height</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_length</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_linelength</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_lines</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>unicode</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>view_separator</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>width</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> - <list> - <string>quantity</string> - <string>price</string> - </list> - </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>height</string> </key> - <value> <int>5</int> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>max_length</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_linelength</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_lines</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>mapped_value_property_list</string> </value> - </item> - <item> - <key> <string>unicode</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>view_separator</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -<br /> - -]]></string> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>40</int> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/matrixbox.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/matrixbox.xml deleted file mode 100644 index d1d0fa941f468a24bef96d03a4086c1b56429a25..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/matrixbox.xml +++ /dev/null @@ -1,370 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.ERP5Form.MatrixBox</string> - <string>MatrixBox</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>matrixbox</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> - </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>cell_base_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>columns</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>editable_attributes</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>getter_method</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>global_attributes</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>lines</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>tabs</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>update_cell_range</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>cell_base_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>columns</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </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>editable_attributes</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>getter_method</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>global_attributes</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>lines</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> - </value> - </item> - <item> - <key> <string>tabs</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>update_cell_range</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>cell_base_id</string> </key> - <value> <string>movement</string> </value> - </item> - <item> - <key> <string>columns</string> </key> - <value> - <list> - <tuple> - <string>None</string> - <string>None</string> - </tuple> - </list> - </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>editable_attributes</string> </key> - <value> - <list> - <tuple> - <string>quantity</string> - <string>quantity</string> - </tuple> - <tuple> - <string>membership_criterion_category_list</string> - <string>membership_criterion_category_list</string> - </tuple> - </list> - </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>getter_method</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>global_attributes</string> </key> - <value> - <list> - <tuple> - <string>mapped_value_property_list</string> - <string>mapped_value_property_list</string> - </tuple> - <tuple> - <string>membership_criterion_base_category_list</string> - <string>membership_criterion_base_category_list</string> - </tuple> - </list> - </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>lines</string> </key> - <value> - <list> - <tuple> - <string>None</string> - <string>None</string> - </tuple> - </list> - </value> - </item> - <item> - <key> <string>tabs</string> </key> - <value> - <list> - <tuple> - <string>None</string> - <string>None</string> - </tuple> - </list> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>matrixbox</string> </value> - </item> - <item> - <key> <string>update_cell_range</string> </key> - <value> <int>1</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>python:[(x,x) for x in here.DeliveryLine_asCellRange()[1]]</string> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> - <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>python:[(x,x) for x in here.DeliveryLine_asCellRange()[0]]</string> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="4" aka="AAAAAAAAAAQ="> - <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>python:[(x,x) for x in here.DeliveryLine_asCellRange()[2]]</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/matrixbox_membership_criterion_category_list.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/matrixbox_membership_criterion_category_list.xml deleted file mode 100644 index 76fd4194f022a6f58cfc6498daae1f8cd1206b13..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/matrixbox_membership_criterion_category_list.xml +++ /dev/null @@ -1,331 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>LinesField</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>matrixbox_membership_criterion_category_list</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>line_too_long</string> </key> - <value> <string>A line was too long.</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>too_long</string> </key> - <value> <string>You entered too many characters.</string> </value> - </item> - <item> - <key> <string>too_many_lines</string> </key> - <value> <string>You entered too many lines.</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>height</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_length</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_linelength</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_lines</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>unicode</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>view_separator</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>width</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> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </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>height</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_length</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_linelength</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_lines</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>unicode</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>view_separator</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>width</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> - <list/> - </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>height</string> </key> - <value> <int>5</int> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>max_length</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_linelength</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_lines</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>matrixbox_membership_criterion_category_list</string> </value> - </item> - <item> - <key> <string>unicode</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>view_separator</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -<br /> - -]]></string> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>40</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>python: cell_index</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/matrixbox_quantity.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/matrixbox_quantity.xml deleted file mode 100644 index f1891c16088273edbe683a4dfc0e6b0212424c65..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/matrixbox_quantity.xml +++ /dev/null @@ -1,285 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>IntegerField</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>matrixbox_quantity</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>integer_out_of_range</string> </key> - <value> <string>The integer you entered was out of range.</string> </value> - </item> - <item> - <key> <string>not_integer</string> </key> - <value> <string>You did not enter an integer.</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>end</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>required</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>start</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> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </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>end</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>required</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>start</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></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> <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>end</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>align=right</string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>start</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>matrixbox_quantity</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>python: here.Integer_toString(int(cell.getProperty(\'quantity\')))</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/membership_criterion_base_category_list.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/membership_criterion_base_category_list.xml deleted file mode 100644 index cbf88726c94d53a26c52260f1e0dbf6ea74151cb..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/membership_criterion_base_category_list.xml +++ /dev/null @@ -1,331 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>LinesField</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>membership_criterion_base_category_list</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>line_too_long</string> </key> - <value> <string>A line was too long.</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>too_long</string> </key> - <value> <string>You entered too many characters.</string> </value> - </item> - <item> - <key> <string>too_many_lines</string> </key> - <value> <string>You entered too many lines.</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>height</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_length</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_linelength</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_lines</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>unicode</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>view_separator</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>width</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> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </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>height</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_length</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_linelength</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_lines</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>unicode</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>view_separator</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>width</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> - <list/> - </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>height</string> </key> - <value> <int>5</int> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>max_length</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_linelength</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_lines</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>domain_base_category_list</string> </value> - </item> - <item> - <key> <string>unicode</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>view_separator</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -<br /> - -]]></string> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>width</string> </key> - <value> <int>40</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>python: here.getVariationBaseCategoryList()</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/my_resource_title.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/my_resource_title.xml deleted file mode 100644 index 7e03382bb12e5d20b9e78ed5031f19578eff5e52..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/my_resource_title.xml +++ /dev/null @@ -1,272 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>StringField</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>my_resource_title</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>too_long</string> </key> - <value> <string>Too much input was 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>max_length</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>truncate</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>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>max_length</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>truncate</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>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>0</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>hidden</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>max_length</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Coupure :</string> </value> - </item> - <item> - <key> <string>truncate</string> </key> - <value> <int>0</int> </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/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/my_total_price%20.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/my_total_price%20.xml deleted file mode 100644 index ef806668759c1a6a09ce3ad20ed6ce989d6ffea9..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashMovementLine_view/my_total_price%20.xml +++ /dev/null @@ -1,285 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>IntegerField</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>my_total_price </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>integer_out_of_range</string> </key> - <value> <string>The integer you entered was out of range.</string> </value> - </item> - <item> - <key> <string>not_integer</string> </key> - <value> <string>You did not enter an integer.</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>end</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>required</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>start</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> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </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>end</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>required</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>start</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></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> <int>20</int> </value> - </item> - <item> - <key> <string>editable</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>enabled</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>end</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> <int>0</int> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>start</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Montant :</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>python: here.Integer_toString(int(here.getTotalPrice()))</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ContainerLine_view.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ContainerLine_view.xml index a786abf3244fa9c7ec941637095fc9f8b0364008..e3b6344fce3ac1e6126c78102f9f4e48b4c9ef82 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ContainerLine_view.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ContainerLine_view.xml @@ -99,8 +99,8 @@ <value> <list> <string>matrixbox_membership_criterion_category_list</string> - <string>matrixbox_quantity</string> <string>membership_criterion_base_category_list</string> + <string>matrixbox_quantity</string> </list> </value> </item> @@ -109,7 +109,7 @@ <value> <list> <string>my_resource_title</string> - <string>my_total_price </string> + <string>my_total_price</string> </list> </value> </item> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ContainerLine_view/matrixbox_quantity.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ContainerLine_view/matrixbox_quantity.xml index f1891c16088273edbe683a4dfc0e6b0212424c65..245b0268c2d7440b920884162f932a28cb3399be 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ContainerLine_view/matrixbox_quantity.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ContainerLine_view/matrixbox_quantity.xml @@ -5,7 +5,7 @@ <tuple> <tuple> <string>Products.Formulator.StandardFields</string> - <string>IntegerField</string> + <string>FloatField</string> </tuple> <none/> </tuple> @@ -31,12 +31,8 @@ <value> <string>The input failed the external validator.</string> </value> </item> <item> - <key> <string>integer_out_of_range</string> </key> - <value> <string>The integer you entered was out of range.</string> </value> - </item> - <item> - <key> <string>not_integer</string> </key> - <value> <string>You did not enter an integer.</string> </value> + <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> @@ -81,10 +77,6 @@ <key> <string>enabled</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>end</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>external_validator</string> </key> <value> <string></string> </value> @@ -98,11 +90,15 @@ <value> <string></string> </value> </item> <item> - <key> <string>required</string> </key> + <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>start</string> </key> + <key> <string>required</string> </key> <value> <string></string> </value> </item> <item> @@ -154,10 +150,6 @@ <key> <string>enabled</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>end</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>external_validator</string> </key> <value> <string></string> </value> @@ -171,11 +163,15 @@ <value> <string></string> </value> </item> <item> - <key> <string>required</string> </key> + <key> <string>input_style</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>start</string> </key> + <key> <string>precision</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> <value> <string></string> </value> </item> <item> @@ -225,30 +221,30 @@ <key> <string>enabled</string> </key> <value> <int>1</int> </value> </item> - <item> - <key> <string>end</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>align=right</string> </value> + <value> <string></string> </value> </item> <item> <key> <string>hidden</string> </key> <value> <int>0</int> </value> </item> <item> - <key> <string>required</string> </key> - <value> <int>0</int> </value> + <key> <string>input_style</string> </key> + <value> <string>-1 234.5</string> </value> </item> <item> - <key> <string>start</string> </key> + <key> <string>precision</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>title</string> </key> <value> <string>matrixbox_quantity</string> </value> @@ -277,7 +273,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: here.Integer_toString(int(cell.getProperty(\'quantity\')))</string> </value> + <value> <string>python: int(cell.getProperty(\'quantity\'))</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ContainerLine_view/my_total_price%20.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ContainerLine_view/my_total_price.xml similarity index 90% rename from bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ContainerLine_view/my_total_price%20.xml rename to bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ContainerLine_view/my_total_price.xml index 29a7c7fc2eb2b4a91b13e64701a67d266092e2de..923c1c4b65d18c468f38fb87a800b1ce0b6f8b95 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ContainerLine_view/my_total_price%20.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/ContainerLine_view/my_total_price.xml @@ -5,7 +5,7 @@ <tuple> <tuple> <string>Products.Formulator.StandardFields</string> - <string>IntegerField</string> + <string>FloatField</string> </tuple> <none/> </tuple> @@ -20,7 +20,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>my_total_price </string> </value> + <value> <string>my_total_price</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -31,12 +31,8 @@ <value> <string>The input failed the external validator.</string> </value> </item> <item> - <key> <string>integer_out_of_range</string> </key> - <value> <string>The integer you entered was out of range.</string> </value> - </item> - <item> - <key> <string>not_integer</string> </key> - <value> <string>You did not enter an integer.</string> </value> + <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> @@ -81,10 +77,6 @@ <key> <string>enabled</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>end</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>external_validator</string> </key> <value> <string></string> </value> @@ -98,11 +90,15 @@ <value> <string></string> </value> </item> <item> - <key> <string>required</string> </key> + <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>start</string> </key> + <key> <string>required</string> </key> <value> <string></string> </value> </item> <item> @@ -154,10 +150,6 @@ <key> <string>enabled</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>end</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>external_validator</string> </key> <value> <string></string> </value> @@ -171,11 +163,15 @@ <value> <string></string> </value> </item> <item> - <key> <string>required</string> </key> + <key> <string>input_style</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>start</string> </key> + <key> <string>precision</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> <value> <string></string> </value> </item> <item> @@ -225,10 +221,6 @@ <key> <string>enabled</string> </key> <value> <int>1</int> </value> </item> - <item> - <key> <string>end</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>external_validator</string> </key> <value> <string></string> </value> @@ -242,16 +234,20 @@ <value> <int>0</int> </value> </item> <item> - <key> <string>required</string> </key> - <value> <int>0</int> </value> + <key> <string>input_style</string> </key> + <value> <string>-1 234.5</string> </value> </item> <item> - <key> <string>start</string> </key> + <key> <string>precision</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>title</string> </key> - <value> <string>Montant Total</string> </value> + <value> <string>Total Amount</string> </value> </item> <item> <key> <string>whitespace_preserve</string> </key> @@ -277,7 +273,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here.Integer_toString(int(here.getTotalPrice()))</string> </value> + <value> <string>python: int(here.getTotalPrice(fast=0))</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Container_view/listbox.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Container_view/listbox.xml index 42589cea379c7be2ea8aabfb30b57b00cb635c59..8e12299b3c4fdbecf7c5db6a6bd37f40bc1e2945 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Container_view/listbox.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Container_view/listbox.xml @@ -350,6 +350,10 @@ </list> </value> </item> + <item> + <key> <string>count_method</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>css_class</string> </key> <value> <string></string> </value> @@ -431,8 +435,8 @@ <value> <list> <tuple> - <string>Cash Container Line</string> - <string>Cash Container Line</string> + <string>Container Line</string> + <string>Container Line</string> </tuple> </list> </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 2e14c91f2102923fb7429c505332c7165f17b22b..ed386fc8c9dc678b32e4517ac65f317ab9fa5c4c 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 @@ -78,40 +78,28 @@ resource_dict = {}\n vault_dict = {}\n vault_inventory_dict = {}\n \n -for vault in context.objectValues():\n - vault_url = vault.getRelativeUrl()\n - vault_dict[vault_url] = 1\n - vault_inventory_dict[vault_url] = {}\n - for vault_inventory in context.portal_simulation.getInventoryStat( node_category=vault.getRelativeUrl()\n - , resource_category=\'currency/\' + context.Baobab_getPortalReferenceCurrencyID()\n - , ignore_variation=0\n - ):\n - try:\n - resource = (vault_inventory[8], getVariationTitleList(vault_inventory[10])[2])\n - except:\n - raise \'not enough columns\', repr(([x for x in vault_inventory]))\n -\n - if not vault_inventory_dict[vault_url].has_key(resource):\n - vault_inventory_dict[vault_url][resource] = {\'quantity\':0, \'total_price\':0}\n - quantity = vault_inventory[1] or 0\n - total_price = vault_inventory[2] or 0\n - vault_inventory_dict[vault_url][resource][\'quantity\'] = vault_inventory_dict[vault_url][resource][\'quantity\'] + quantity\n - vault_inventory_dict[vault_url][resource][\'total_price\'] = vault_inventory_dict[vault_url][resource][\'total_price\'] + total_price\n -\n - resource_dict[resource] = 1\n +vault_url = vault\n +vault_dict[vault_url] = 1\n +vault_inventory_dict[vault_url] = {}\n +vault_inventory_list = context.portal_simulation.getInventoryList( node_category=vault\n + #, resource_category=\'currency/\' + context.Baobab_getPortalReferenceCurrencyID()\n + , ignore_variation=0\n + )\n +context.log(\'len(vault_inventory_list:\',len(vault_inventory_list))\n +for vault_inventory in vault_inventory_list:\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_uid, tuple(getVariationTitleList(vault_inventory.resource_relative_url)))\n + if not vault_inventory_dict[vault_url].has_key(resource):\n + vault_inventory_dict[vault_url][resource] = {\'quantity\':vault_inventory.total_quantity, \'total_price\':vault_inventory.total_price}\n \n -#return repr(vault_inventory_dict)\n + resource_dict[resource] = 1\n \n -#for v in vault_inventory_dict.items():\n -# print v[0]\n -# for r in v[1].items():\n -# print repr(r)\n -\n -#return printed\n \n if column_names == 1:\n column_list = [(\'resource\', \'Resource\'), (\'variation_text\', \'Year\')]\n for vault in vault_dict.keys():\n + context.log(\'getTitleFromCategoryUrl(vault)\',getTitleFromCategoryUrl(vault))\n column_list.extend([\n (vault + \'_quantity\', getTitleFromCategoryUrl(vault) + \' Quantity\'),\n (vault + \'_total_price\', getTitleFromCategoryUrl(vault) + \' TotalPrice\')\n @@ -121,19 +109,24 @@ if column_names == 1:\n \n total_inventory_list = []\n \n +context.log(\'resource_dict\',resource_dict)\n +context.log(\'vault_inventory_dict\',vault_inventory_dict)\n +\n +i = 0\n for resource in context.Baobab_sortResourceTitleList(resource_dict.keys()):\n - tmp_dict = {\'resource\':resource[0][:resource[0].find(\'Fran\')], \'variation_text\':resource[1]}\n + tmp_dict = {\'resource\':resource[0], \'variation_text\':resource[1]}\n general_total_price = 0\n for vault in vault_dict.keys():\n try:\n resource_in_vault = vault_inventory_dict[vault][resource]\n except KeyError:\n resource_in_vault = {\'quantity\' : 0,\'total_price\' : 0}\n - tmp_dict.update({vault + \'_quantity\' : resource_in_vault[\'quantity\'],\n - vault + \'_total_price\' : resource_in_vault[\'total_price\']})\n + tmp_dict.update({\'total_quantity\' : resource_in_vault[\'quantity\'],\n + \'total_price\' : resource_in_vault[\'total_price\']})\n general_total_price += resource_in_vault[\'total_price\']\n tmp_dict[\'general_total_price\'] = general_total_price\n - total_inventory_list.append(newTempBase(context, resource, **tmp_dict))\n + total_inventory_list.append(newTempBase(context, "new_%3i" % i, **tmp_dict))\n + i += 1\n return total_inventory_list\n return repr([x for x in total_inventory_list])\n </string> </value> @@ -144,6 +137,12 @@ return repr([x for x in total_inventory_list])\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/CounterModule_getVaultTransactionList</string> </value> @@ -156,7 +155,7 @@ return repr([x for x in total_inventory_list])\n </item> <item> <key> <string>_params</string> </key> - <value> <string>column_names=0, **kw</string> </value> + <value> <string>vault=None,column_names=0, **kw</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -176,12 +175,13 @@ return repr([x for x in total_inventory_list])\n <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>1</int> </value> + <value> <int>2</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> + <string>vault</string> <string>column_names</string> <string>kw</string> <string>Products.ERP5Type.Document</string> @@ -191,28 +191,29 @@ return repr([x for x in total_inventory_list])\n <string>resource_dict</string> <string>vault_dict</string> <string>vault_inventory_dict</string> - <string>_getiter_</string> - <string>_getattr_</string> - <string>context</string> - <string>vault</string> <string>vault_url</string> <string>_write_</string> + <string>_getattr_</string> + <string>context</string> + <string>vault_inventory_list</string> + <string>len</string> + <string>_getiter_</string> <string>vault_inventory</string> - <string>_getitem_</string> + <string>tuple</string> <string>resource</string> - <string>repr</string> - <string>append</string> - <string>$append0</string> - <string>x</string> - <string>quantity</string> - <string>total_price</string> + <string>_getitem_</string> <string>column_list</string> <string>total_inventory_list</string> + <string>i</string> <string>tmp_dict</string> <string>general_total_price</string> <string>resource_in_vault</string> <string>KeyError</string> <string>_apply_</string> + <string>repr</string> + <string>append</string> + <string>$append0</string> + <string>x</string> </tuple> </value> </item> @@ -225,6 +226,7 @@ return repr([x for x in total_inventory_list])\n <key> <string>func_defaults</string> </key> <value> <tuple> + <none/> <int>0</int> </tuple> </value> @@ -242,4 +244,25 @@ return repr([x for x in total_inventory_list])\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/CounterModule_viewReportDialog.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewReportDialog.xml index 1b3679de8b199294c14dfcecd233bd9fa6fa76b2..699287c3364a177f89d58a25ddfdff514dc68372 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 @@ -113,7 +113,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string></string> </value> + <value> <string>Report</string> </value> </item> <item> <key> <string>unicode_mode</string> </key> diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getVaultItemList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getVaultItemList.xml index 4b0948c9be0bd4560c4eba475ebeaa1761234be2..57f443b2311d6c62ef100d5daf0d680adf345aa8 100644 --- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getVaultItemList.xml +++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getVaultItemList.xml @@ -188,6 +188,10 @@ def getVaultItemList(vault_type=None, exclude_vault_type=None,\n for i in xrange(path_len):\n if i%2 == 0 and i != 0:\n new_title_list.append(title_path_list[i])\n + elif \'Ventilation\' in title_path_list[i]:\n + new_title_list.append(\'Ventilation\')\n + elif \'Transit\' in title_path_list[i]:\n + new_title_list.append(\'Transit\')\n if id not in new_title_list: # ie last part of path\n new_title_list.append(id)\n # put back the counter name into the list\n @@ -220,7 +224,9 @@ if user_site == 1:\n for site in site_list:\n if "guichet" in site:\n site = context.Baobab_getVaultSite(vault=site)\n - new_site_list.append(site.getRelativeUrl())\n + new_site_list.append(site.getRelativeUrl())\n + else:\n + new_site_list.append(site)\n site_list = new_site_list\n else:\n site_list = [\'site\']\n 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 09e22c59ec000ef1c33bc6f6f3c0b83c54d294ec..79aa06696e7f93fd68dacb018fb855cbe6b944f2 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 @@ -161,13 +161,13 @@ if import_type == \'create_category\' :\n for e_list in line_list :\n if len(e_list) > 0 :\n e = e_list[0]\n - try :\n - print \'trying to create %s ...\' % lowerCase(e),\n - create_category(e)\n - print \'done\'\n - except :\n - print \'Failed\'\n - return printed\n + #try :\n + print \'trying to create %s ...\' % lowerCase(e),\n + create_category(e)\n + print \'done\'\n +# except AttributeError:\n +# print \'Failed\'\n +# return printed\n \n \n elif import_type == \'assign_codification\' :\n @@ -180,13 +180,13 @@ elif import_type == \'assign_codification\' :\n # Automatically assign code for some subcategories\n context.log(\'e_list[0]\',e_list[0])\n if e_list[0].startswith(\'site\'):\n - vault_code = {\'banque_interne\':\'BI\',\'operations_diverses\':\'OD\',\'gros_paiement\':\'GP\',\'gros_versement\':\'GV\',\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 for sub_cat in category.getCategoryChildValueList(sort_id=\'path\'):\n - if sub_cat.getId() in vault_code.keys():\n + if sub_cat.getId() in acquired_vault_code.keys():\n parent_code = sub_cat.getParentValue().getCodification()\n - code = parent_code + vault_code[sub_cat.getId()]\n + code = parent_code + acquired_vault_code[sub_cat.getId()]\n sub_cat.setCodification(code)\n print \'done %s\' % repr(e_list)\n except KeyError:\n @@ -261,7 +261,8 @@ elif import_type == \'create_subvaults\' :\n else:\n #context.log(\'add encaisse des billets et monnaies\',counter_subvault)\n subvault_dict[vault].append([\'%s/%s\' % (counter_subvault, c.getTitle()), None])\n - if subvault == \'Encaisse des Billets Recus pour Ventilation\' :\n + if subvault in (\'Encaisse des Billets Recus pour Ventilation Venant de\',\'Encaisse des Billets en Transit Allant a\',\n + \'Encaisse des Billets Neufs Non Emis en Transit Allant a\') :\n for c in context.portal_categories.site.agence.principale.objectIds() :\n if counter_name in two_way_counter_list:\n #context.log(\'add ventilation E/S\', counter_subvault)\n @@ -282,7 +283,10 @@ elif import_type == \'create_subvaults\' :\n context.log("vault_type_dict :",subvault_dict)\n \n # parse the for site category tree and add sub categories if required\n + #for c in context.portal_categories.site.getCategoryChildValueList() :\n + #for c in context.portal_categories.site.agence.principale.lome.getCategoryChildValueList() :\n for c in context.portal_categories.site.getCategoryChildValueList() :\n + context.log(\'c.getPath()\',c.getPath())\n for vault_type in vault_type_list :\n context.log("c = %s, vault_type = %s" %(c, vault_type), "c.getvaultType = %s" %(c.getVaultType()))\n if context.portal_categories.isMemberOf(c, vault_type, strict=1) :\n @@ -290,17 +294,20 @@ elif import_type == \'create_subvaults\' :\n for subvault_data in subvault_dict[vault_type] :\n subvault_path = subvault_data[0]\n subvault_code = subvault_data[1]\n - if \'Encaisse des Billets Recus pour Ventilation\' in subvault_path or \'Encaisse des Billets Restitues par Tiers a Detruire\' in subvault_path :\n + if \'Encaisse des Billets Recus pour Ventilation Venant de\' in subvault_path or \'Encaisse des Billets Restitues par Tiers a Detruire\' in subvault_path \\\n + or \'Encaisse des Billets en Transit Allant a\' in subvault_path or \'Encaisse des Billets Neufs Non Emis en Transit Allant a\' in subvault_path:\n if not context.portal_categories.isMemberOf(c, \'site/agence/principale\', strict=0) :\n - #print \'XXXXXXXX is not principale, not creating\', subvault_path\n + print \'XXXXXXXX is not principale, not creating\', subvault_path\n pass\n elif subvault_path.find(\'/\') > 0 and lowerCase(subvault_path).split(\'/\')[1] in c.getRelativeUrl() :\n - #print \'XXXXXXXX is itself, not creating\', subvault_path\n + print \'XXXXXXXX is itself, not creating\', subvault_path\n pass\n else :\n print \' creating\', 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 + subcat_vault_type = \'%s/transit\' %(\'/\'.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 @@ -407,7 +414,7 @@ return printed\n <string>len</string> <string>e</string> <string>category</string> - <string>vault_code</string> + <string>acquired_vault_code</string> <string>sub_cat</string> <string>parent_code</string> <string>code</string> diff --git a/bt5/erp5_banking_core/bt/change_log b/bt5/erp5_banking_core/bt/change_log index e1777699c3fbe9c272cd70ab8d56df4b3e49ea62..0a0f4dd1cb08c6bed92b9cb5007a6e23e33fc5c5 100644 --- a/bt5/erp5_banking_core/bt/change_log +++ b/bt5/erp5_banking_core/bt/change_log @@ -1,3 +1,6 @@ +2006-05-18 aurel +* update Delivery_getVaultItemList to take new categories into account and fix Baobab_getResourceVintageList + 2006-05-11 aurel * update catalog method to take getBaobabSource/DestinationVariationText into account diff --git a/bt5/erp5_banking_core/bt/maintainer_list b/bt5/erp5_banking_core/bt/maintainer_list new file mode 100644 index 0000000000000000000000000000000000000000..52f9a68e9fbe94ceffba90be6e2e035cbb9632c8 --- /dev/null +++ b/bt5/erp5_banking_core/bt/maintainer_list @@ -0,0 +1,2 @@ +aurel +seb \ No newline at end of file