From efc2c17152c0a13ebce0863d23efd16218af8a70 Mon Sep 17 00:00:00 2001 From: Arnaud Fontaine <arnaud.fontaine@nexedi.com> Date: Thu, 6 Jun 2013 18:17:40 +0900 Subject: [PATCH] P-S: Revert "Merge erp5_accounting_alternate_catalog in erp5_accounting" This reverts commit 70a8e561dfb49a61061f1691a5b35b48602baca9 because this changes is about improving the performances of Accounting Transaction Module not used in this project. Moreover, this change would required to reindex Accounting Transaction Module. Conflicts: bt5/erp5_configurator_standard/bt/revision --- ...nting_transaction_section.catalog_keys.xml | 2 - ...related_accounting_transaction_section.xml | 37 - .../related_key_list.xml | 6 - ...nModule_countAccountingTransactionList.xml | 28 +- ...ionModule_getAccountingTransactionList.xml | 154 +- ...onModule_viewAccountingTransactionList.xml | 14 +- .../listbox.xml | 162 +- .../listbox_credit.xml | 293 +++ .../listbox_debit.xml | 293 +++ .../listbox_delivery_mirror_section_title.xml | 275 +++ ...elivery_mirror_section_title_with_link.xml | 275 +++ ...=> listbox_delivery_own_section_title.xml} | 2 +- .../listbox_operation_date.xml | 2 +- .../listbox_total_net_price.xml | 293 +++ ...onModule_zGetAccountingTransactionList.xml | 754 ++++++ bt5/erp5_accounting/bt/revision | 2 +- .../bt/template_catalog_method_id_list | 9 - .../bt/template_catalog_related_key_list | 8 +- .../datetime_key_list.xml | 0 ...op_accounting_transaction.catalog_keys.xml | 0 .../z0_drop_accounting_transaction.xml | 0 ...og_accounting_transaction.catalog_keys.xml | 0 .../z0_uncatalog_accounting_transaction.xml | 0 ...counting_transaction_list.catalog_keys.xml | 0 .../z_catalog_accounting_transaction_list.xml | 0 ...te_accounting_transaction.catalog_keys.xml | 0 .../z_create_accounting_transaction.xml | 0 ...ransaction_mirror_section.catalog_keys.xml | 0 ..._accounting_transaction_mirror_section.xml | 0 ...nting_transaction_payment.catalog_keys.xml | 0 ...related_accounting_transaction_payment.xml | 0 ...nting_transaction_project.catalog_keys.xml | 0 ...related_accounting_transaction_project.xml | 0 ...ng_transaction_stock_line.catalog_keys.xml | 0 ...ated_accounting_transaction_stock_line.xml | 0 .../related_key_list.xml | 7 + .../result_table_list.xml | 0 .../erp5_accounting_alternate_catalog.xml | 47 + ...ionModule_getAccountingTransactionList.xml | 177 ++ ...onModule_viewAccountingTransactionList.xml | 159 ++ .../listbox.xml | 265 +++ ...nting_transaction_mirror_section_title.xml | 0 ...x_accounting_transaction_payment_title.xml | 0 ...x_accounting_transaction_project_title.xml | 0 .../listbox_operation_date.xml | 2045 +++++++++++++++++ .../listbox_total_credit.xml | 0 .../listbox_total_debit.xml | 0 .../Brain_getMirrorSectionTitle.xml | 0 .../Brain_getPaymentTitle.xml | 0 .../Brain_getProjectTitle.xml | 0 ...action_statInternalTransactionLineList.xml | 0 .../bt/description | 1 + .../bt/revision | 1 + .../bt/template_catalog_datetime_key_list | 0 .../bt/template_catalog_method_id_list | 8 + .../bt/template_catalog_related_key_list | 5 + .../bt/template_catalog_result_table_list | 0 .../bt/template_format_version | 1 + .../bt/template_skin_id_list | 1 + .../bt/title | 1 + .../bt/version | 1 + ...BusinessConfiguration_setupStandardBT5.xml | 3 +- bt5/erp5_configurator_standard/bt/revision | 2 +- .../tests/ConfiguratorTestMixin.py | 1 - product/ERP5Type/tests/testFunctionalCore.py | 6 + 65 files changed, 5132 insertions(+), 208 deletions(-) delete mode 100644 bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_section.catalog_keys.xml delete mode 100644 bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_section.xml create mode 100644 bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_credit.xml create mode 100644 bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_debit.xml create mode 100644 bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_delivery_mirror_section_title.xml create mode 100644 bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_delivery_mirror_section_title_with_link.xml rename bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/{listbox_accounting_transaction_section_title.xml => listbox_delivery_own_section_title.xml} (99%) create mode 100644 bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_total_net_price.xml create mode 100644 bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml rename bt5/{erp5_accounting => erp5_accounting_alternate_catalog}/CatalogDateTimeKeyTemplateItem/datetime_key_list.xml (100%) rename bt5/{erp5_accounting => erp5_accounting_alternate_catalog}/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_accounting_transaction.catalog_keys.xml (100%) rename bt5/{erp5_accounting => erp5_accounting_alternate_catalog}/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_accounting_transaction.xml (100%) rename bt5/{erp5_accounting => erp5_accounting_alternate_catalog}/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_accounting_transaction.catalog_keys.xml (100%) rename bt5/{erp5_accounting => erp5_accounting_alternate_catalog}/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_accounting_transaction.xml (100%) rename bt5/{erp5_accounting => erp5_accounting_alternate_catalog}/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_accounting_transaction_list.catalog_keys.xml (100%) rename bt5/{erp5_accounting => erp5_accounting_alternate_catalog}/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_accounting_transaction_list.xml (100%) rename bt5/{erp5_accounting => erp5_accounting_alternate_catalog}/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_accounting_transaction.catalog_keys.xml (100%) rename bt5/{erp5_accounting => erp5_accounting_alternate_catalog}/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_accounting_transaction.xml (100%) rename bt5/{erp5_accounting => erp5_accounting_alternate_catalog}/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_mirror_section.catalog_keys.xml (100%) rename bt5/{erp5_accounting => erp5_accounting_alternate_catalog}/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_mirror_section.xml (100%) rename bt5/{erp5_accounting => erp5_accounting_alternate_catalog}/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_payment.catalog_keys.xml (100%) rename bt5/{erp5_accounting => erp5_accounting_alternate_catalog}/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_payment.xml (100%) rename bt5/{erp5_accounting => erp5_accounting_alternate_catalog}/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_project.catalog_keys.xml (100%) rename bt5/{erp5_accounting => erp5_accounting_alternate_catalog}/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_project.xml (100%) rename bt5/{erp5_accounting => erp5_accounting_alternate_catalog}/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_stock_line.catalog_keys.xml (100%) rename bt5/{erp5_accounting => erp5_accounting_alternate_catalog}/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_stock_line.xml (100%) create mode 100644 bt5/erp5_accounting_alternate_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml rename bt5/{erp5_accounting => erp5_accounting_alternate_catalog}/CatalogResultTableTemplateItem/result_table_list.xml (100%) create mode 100644 bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog.xml create mode 100644 bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_getAccountingTransactionList.xml create mode 100644 bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList.xml create mode 100644 bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml rename bt5/{erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting => erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog}/AccountingTransactionModule_viewAccountingTransactionList/listbox_accounting_transaction_mirror_section_title.xml (100%) rename bt5/{erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting => erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog}/AccountingTransactionModule_viewAccountingTransactionList/listbox_accounting_transaction_payment_title.xml (100%) rename bt5/{erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting => erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog}/AccountingTransactionModule_viewAccountingTransactionList/listbox_accounting_transaction_project_title.xml (100%) create mode 100644 bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList/listbox_operation_date.xml rename bt5/{erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting => erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog}/AccountingTransactionModule_viewAccountingTransactionList/listbox_total_credit.xml (100%) rename bt5/{erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting => erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog}/AccountingTransactionModule_viewAccountingTransactionList/listbox_total_debit.xml (100%) rename bt5/{erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting => erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog}/Brain_getMirrorSectionTitle.xml (100%) rename bt5/{erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting => erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog}/Brain_getPaymentTitle.xml (100%) rename bt5/{erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting => erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog}/Brain_getProjectTitle.xml (100%) rename bt5/{erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting => erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog}/InternalInvoiceTransaction_statInternalTransactionLineList.xml (100%) create mode 100644 bt5/erp5_accounting_alternate_catalog/bt/description create mode 100644 bt5/erp5_accounting_alternate_catalog/bt/revision rename bt5/{erp5_accounting => erp5_accounting_alternate_catalog}/bt/template_catalog_datetime_key_list (100%) create mode 100644 bt5/erp5_accounting_alternate_catalog/bt/template_catalog_method_id_list create mode 100644 bt5/erp5_accounting_alternate_catalog/bt/template_catalog_related_key_list rename bt5/{erp5_accounting => erp5_accounting_alternate_catalog}/bt/template_catalog_result_table_list (100%) create mode 100644 bt5/erp5_accounting_alternate_catalog/bt/template_format_version create mode 100644 bt5/erp5_accounting_alternate_catalog/bt/template_skin_id_list create mode 100644 bt5/erp5_accounting_alternate_catalog/bt/title create mode 100644 bt5/erp5_accounting_alternate_catalog/bt/version diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_section.catalog_keys.xml b/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_section.catalog_keys.xml deleted file mode 100644 index a540f9431e..0000000000 --- a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_section.catalog_keys.xml +++ /dev/null @@ -1,2 +0,0 @@ -<catalog_method> -</catalog_method> diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_section.xml b/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_section.xml deleted file mode 100644 index 7e84f4847a..0000000000 --- a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_section.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="SQL" module="Products.ZSQLMethods.SQL"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>arguments_src</string> </key> - <value> <string>table_0</string> </value> - </item> - <item> - <key> <string>connection_id</string> </key> - <value> <string>erp5_sql_connection</string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>z_related_accounting_transaction_section</string> </value> - </item> - <item> - <key> <string>src</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -accounting_transaction.section_uid = <dtml-var table_0>.uid\n - - -]]></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_accounting/CatalogRelatedKeyTemplateItem/related_key_list.xml b/bt5/erp5_accounting/CatalogRelatedKeyTemplateItem/related_key_list.xml index debd7365b9..3e65965e9b 100644 --- a/bt5/erp5_accounting/CatalogRelatedKeyTemplateItem/related_key_list.xml +++ b/bt5/erp5_accounting/CatalogRelatedKeyTemplateItem/related_key_list.xml @@ -1,10 +1,4 @@ <key_list> - <key>accounting_transaction_line_node_uid | stock/node_uid/z_related_accounting_transaction_stock_line</key> - <key>accounting_transaction_line_total_price | stock/total_price/z_related_accounting_transaction_stock_line</key> - <key>accounting_transaction_mirror_section_title | catalog/title/z_related_accounting_transaction_mirror_section</key> - <key>accounting_transaction_payment_title | catalog/title/z_related_accounting_transaction_payment</key> - <key>accounting_transaction_project_title | catalog/title/z_related_accounting_transaction_project</key> - <key>accounting_transaction_section_title | catalog/title/z_related_accounting_transaction_section</key> <key>preferred_gap_id | category,catalog/id/z_related_preferred_gap</key> <key>preferred_gap_strict_membership_id | category,catalog/id/z_related_strict_membership_preferred_gap</key> </key_list> \ No newline at end of file diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_countAccountingTransactionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_countAccountingTransactionList.xml index 3007cf76de..c65a9d92c9 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_countAccountingTransactionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_countAccountingTransactionList.xml @@ -50,13 +50,35 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>params[\'stat\'] = 1\n -return context.AccountingTransactionModule_getAccountingTransactionList(**params)\n + <value> <string>if kw.get(\'stat\', 0) :\n + del kw[\'stat\']\n +\n +kw[\'omit_input\'] = 0\n +kw[\'omit_output\'] = 0\n +\n +\n +kw[\'source_section_where_expression\'] = \'\'\n +kw[\'destination_section_where_expression\'] = \'\'\n +\n +if (kw.get(\'operation_date\') or {}).get(\'query\'):\n + buildSQLQuery = context.portal_catalog.buildSQLQuery\n + kw[\'source_section_where_expression\'] = buildSQLQuery(\n + **{\'delivery.start_date\': kw[\'operation_date\']})[\'where_expression\']\n + kw[\'destination_section_where_expression\'] = buildSQLQuery(\n + **{\'delivery.stop_date\': kw[\'operation_date\']})[\'where_expression\']\n + del kw[\'operation_date\']\n +\n +\n +return context.AccountingTransactionModule_zGetAccountingTransactionList( selection=None,\n + selection_params=kw,\n + stat=0,\n + count=1,\n + **kw )\n </string> </value> </item> <item> <key> <string>_params</string> </key> - <value> <string>**params</string> </value> + <value> <string>brain=None, selection=None, **kw</string> </value> </item> <item> <key> <string>id</string> </key> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList.xml index 80f620e47b..1bfe2d4279 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList.xml @@ -50,125 +50,63 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>portal = context.getPortalObject()\n -getUid = portal.portal_categories.getCategoryUid\n + <value> <string encoding="cdata"><![CDATA[ + +# XXX workarounds for DTML limitation\n +# Because DTML cannot do <dtml-if node or resource or...>\n +# If Python is used, it does not check the existence of a variable automatically\n \n -section_category = params.pop(\'section_category\', None)\n -section_category_strict = params.pop(\'section_category_strict\', None)\n -params[\'accounting_transaction.section_uid\'] = \'\'\n -if section_category:\n - params[\'accounting_transaction.section_uid\'] = context.Base_getSectionUidListForSectionCategory(\n - section_category, strict_membership=section_category_strict)\n +if \'node\' not in params:\n + params[\'node\'] = []\n +if \'resource\' not in params:\n + params[\'resource\'] = []\n +if \'from_date\' not in params:\n + params[\'from_date\'] = \'\'\n +if \'to_date\' not in params:\n + params[\'to_date\'] = \'\'\n +if \'section_category\' not in params:\n + params[\'section_category\'] = \'\'\n \n -# rewrite payment_mode_relative_url to uid\n -payment_mode_relative_url = params.pop(\'payment_mode_relative_url\', None)\n -if payment_mode_relative_url:\n - params[\'default_payment_mode_uid\'] = \\\n - portal.portal_categories.payment_mode.getCategoryUid(payment_mode_relative_url)\n +if params.get(\'stat\', 0):\n + params[\'stat\'] = 0\n +if params.get(\'count\', 0):\n + params[\'count\'] = 0\n +params[\'omit_input\'] = 0\n +params[\'omit_output\'] = 0\n \n -# rewrite currency to uid\n -resource = params.pop(\'resource\', None)\n -if resource:\n - params[\'accounting_transaction.resource_uid\'] = getUid(resource)\n \n +params[\'source_section_where_expression\'] = \'\'\n +params[\'destination_section_where_expression\'] = \'\'\n \n -# XXX wrong name compat\n -# TODO: make it better on search dialog\n -node_list = params.pop(\'node\', None)\n -if node_list:\n - params[\'accounting_transaction_line_node_uid\'] = [\n - getUid(node) for node in node_list]\n +if (params.get(\'operation_date\') or {}).get(\'query\'):\n + buildSQLQuery = context.portal_catalog.buildSQLQuery\n + params[\'source_section_where_expression\'] = buildSQLQuery(\n + **{\'delivery.start_date\': params[\'operation_date\']})[\'where_expression\']\n + params[\'destination_section_where_expression\'] = buildSQLQuery(\n + **{\'delivery.stop_date\': params[\'operation_date\']})[\'where_expression\']\n + del params[\'operation_date\']\n \n -entity = params.pop(\'entity\', None)\n -if entity:\n - params[\'accounting_transaction.mirror_section_uid\'] = getUid(entity)\n \n -if not params.get(\'operation_date\'):\n - params.pop(\'from_date\', None)\n - params.pop(\'to_date\', None)\n - if from_date or to_date:\n - if from_date:\n - if to_date:\n - params[\'operation_date\'] = dict(\n - query=(from_date, to_date),\n - range=\'minngt\')\n - else:\n - params[\'operation_date\'] = dict(\n - query=(from_date, ),\n - range=\'min\')\n - else:\n - params[\'operation_date\'] = dict(\n - query=(to_date, ),\n - range=\'ngt\')\n - \n -amount = params.pop(\'amount\', \'\')\n -if amount not in (None, \'\'):\n - params[\'accounting_transaction_line_total_price\'] = amount\n -else:\n - amount_range_min = params.pop(\'amount_range_min\', None)\n - amount_range_max = params.pop(\'amount_range_max\', None)\n - if amount_range_min or amount_range_max:\n - if amount_range_min:\n - if amount_range_max:\n - params[\'accounting_transaction_line_total_price\'] = dict(\n - query=(amount_range_min, amount_range_max),\n - range=\'minmax\')\n - else:\n - params[\'accounting_transaction_line_total_price\'] = dict(\n - query=(amount_range_min, ),\n - range=\'min\')\n - else:\n - params[\'accounting_transaction_line_total_price\'] = dict(\n - query=(amount_range_max, ),\n - range=\'max\')\n +# this method can be used to build another complex query, for example\n +# as a catalog.parent_uid filter with SimulationTool.getMovementList.\n +# In this example, you can use side independant inventory API with \n +# accounting module selection. see erp5_accounting_l10n_fr_m9 for an example.\n +# ... XXX no this is deprecated\n +src__ = context.REQUEST.other.get(\'src__\', 0)\n +search_result_keys = context.REQUEST.other.get(\'search_result_keys\', None)\n \n -\n -creation_date_range_min = params.pop(\'creation_date_range_min\', None)\n -creation_date_range_max = params.pop(\'creation_date_range_max\', None)\n -if creation_date_range_min or creation_date_range_max:\n - if creation_date_range_min:\n - if creation_date_range_max:\n - params[\'creation_date\'] = dict(\n - query=(creation_date_range_min, creation_date_range_max),\n - range=\'minmax\')\n - else:\n - params[\'creation_date\'] = dict(\n - query=(creation_date_range_min, ),\n - range=\'min\')\n - else:\n - params[\'creation_date\'] = dict(\n - query=(creation_date_range_max, ),\n - range=\'max\')\n -\n -if stat:\n - return context.countFolder(**params)\n -\n -select_dict = params.get(\'select_dict\') or dict()\n -select_dict.update(dict(total_debit=None,\n - total_credit=None,\n - reference=None,\n - specific_reference=None,\n - project_uid=None,\n - payment_uid=None,\n - mirror_section_uid=None,\n - operation_date=None))\n -\n -params[\'select_dict\'] = select_dict\n -\n -# We group by uid to really filter duplicated lines, but this makes generated\n -# query much slower, and in reality duplicated lines are transactions for which\n -# both source section and destination section match the criterions. This can be\n -# because there are no criterion on section_uid or because both sections are members\n -# of the selected group. In the later it can be accepted as not a problem.\n -if not params.get(\'accounting_transaction.section_uid\'):\n - params.setdefault(\'group_by\', (\'uid\',))\n -\n -return context.searchFolder(**params)\n -</string> </value> +return context.AccountingTransactionModule_zGetAccountingTransactionList( \n + selection_params=params,\n + src__=src__,\n + search_result_keys=search_result_keys,\n + **params)\n + + +]]></string> </value> </item> <item> <key> <string>_params</string> </key> - <value> <string>from_date=None, to_date=None, stat=False, **params</string> </value> + <value> <string>**params</string> </value> </item> <item> <key> <string>id</string> </key> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList.xml index 67d2bae168..d9b33572f2 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList.xml @@ -70,14 +70,14 @@ <key> <string>hidden</string> </key> <value> <list> - <string>listbox_total_price</string> - <string>listbox_accounting_transaction_section_title</string> - <string>listbox_accounting_transaction_mirror_section_title</string> - <string>listbox_accounting_transaction_payment_title</string> - <string>listbox_accounting_transaction_project_title</string> + <string>listbox_credit</string> + <string>listbox_debit</string> + <string>listbox_delivery_mirror_section_title</string> <string>listbox_operation_date</string> - <string>listbox_total_credit</string> - <string>listbox_total_debit</string> + <string>listbox_delivery_mirror_section_title_with_link</string> + <string>listbox_total_net_price</string> + <string>listbox_total_price</string> + <string>listbox_delivery_own_section_title</string> </list> </value> </item> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml index b5dea32ffa..71ab828d10 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml @@ -21,7 +21,10 @@ <string>selection_name</string> <string>sort</string> <string>sort_columns</string> + <string>stat_columns</string> + <string>stat_method</string> <string>title</string> + <string>url_columns</string> </list> </value> </item> @@ -119,6 +122,14 @@ <key> <string>sort_columns</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>stat_columns</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>stat_method</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>target</string> </key> <value> <string></string> </value> @@ -127,6 +138,10 @@ <key> <string>title</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>url_columns</string> </key> + <value> <string></string> </value> + </item> </dictionary> </value> </item> @@ -143,7 +158,7 @@ <value> <list> <tuple> - <string>accounting_transaction_section_title</string> + <string>delivery_own_section_title</string> <string>Own Section</string> </tuple> <tuple> @@ -163,12 +178,12 @@ <string>Destination Reference</string> </tuple> <tuple> - <string>accounting_transaction_project_title</string> - <string>Project</string> + <string>source_project_title</string> + <string>Supplier Project</string> </tuple> <tuple> - <string>accounting_transaction_payment_title</string> - <string>Section Bank Account</string> + <string>destination_project_title</string> + <string>Client Project</string> </tuple> <tuple> <string>creation_date</string> @@ -178,10 +193,18 @@ <string>modification_date</string> <string>Modification Date</string> </tuple> + <tuple> + <string>delivery_mirror_section_title_with_link</string> + <string>Third Party (with Link)</string> + </tuple> <tuple> <string>total_price</string> <string>Total Price</string> </tuple> + <tuple> + <string>total_net_price</string> + <string>Total Net Price</string> + </tuple> <tuple> <string>causality_title</string> <string>Packing List</string> @@ -194,14 +217,6 @@ <string>owner_title</string> <string>Owner</string> </tuple> - <tuple> - <string>creation_date</string> - <string>Creation Date</string> - </tuple> - <tuple> - <string>modification_date</string> - <string>Modification Date</string> - </tuple> </list> </value> </item> @@ -220,7 +235,7 @@ <string>Title</string> </tuple> <tuple> - <string>accounting_transaction_mirror_section_title</string> + <string>delivery_mirror_section_title</string> <string>Third Party</string> </tuple> <tuple> @@ -244,11 +259,11 @@ <string>State</string> </tuple> <tuple> - <string>total_debit</string> + <string>debit</string> <string>Debit</string> </tuple> <tuple> - <string>total_credit</string> + <string>credit</string> <string>Credit</string> </tuple> </list> @@ -287,8 +302,8 @@ <string>delivery_own_section_title</string> </tuple> <tuple> - <string>accounting_transaction_mirror_section_title</string> - <string>accounting_transaction_mirror_section_title</string> + <string>delivery_mirror_section_title</string> + <string>delivery_mirror_section_title</string> </tuple> <tuple> <string>total_price</string> @@ -375,11 +390,11 @@ <string>Title</string> </tuple> <tuple> - <string>accounting_transaction_section_title</string> + <string>delivery_own_section_title</string> <string>Own Section</string> </tuple> <tuple> - <string>accounting_transaction_mirror_section_title</string> + <string>delivery_mirror_section_title</string> <string>Third Party</string> </tuple> <tuple> @@ -440,13 +455,92 @@ <item> <key> <string>sort</string> </key> <value> - <list/> + <list> + <tuple> + <string>operation_date</string> + <string>operation_date</string> + </tuple> + </list> </value> </item> <item> <key> <string>sort_columns</string> </key> <value> - <list/> + <list> + <tuple> + <string>title</string> + <string>Title</string> + </tuple> + <tuple> + <string>translated_portal_type</string> + <string>Type</string> + </tuple> + <tuple> + <string>operation_date</string> + <string>Accounting Operation Date</string> + </tuple> + <tuple> + <string>reference</string> + <string>Invoice Number</string> + </tuple> + <tuple> + <string>specific_reference</string> + <string>Transaction Reference</string> + </tuple> + <tuple> + <string>source_project_title</string> + <string>Supplier Project</string> + </tuple> + <tuple> + <string>destination_project_title</string> + <string>Client Project</string> + </tuple> + <tuple> + <string>translated_simulation_state_title</string> + <string>State</string> + </tuple> + <tuple> + <string>causality_title</string> + <string>Packing List</string> + </tuple> + <tuple> + <string>translated_causality_state_title</string> + <string>Causality State</string> + </tuple> + <tuple> + <string>creation_date</string> + <string>Creation Date</string> + </tuple> + <tuple> + <string>modification_date</string> + <string>Modification Date</string> + </tuple> + <tuple> + <string>owner_title</string> + <string>Owner</string> + </tuple> + </list> + </value> + </item> + <item> + <key> <string>stat_columns</string> </key> + <value> + <list> + <tuple> + <string>debit</string> + <string>AccountingTransactionModule_statSourceDebit</string> + </tuple> + <tuple> + <string>credit</string> + <string>AccountingTransactionModule_statSourceCredit</string> + </tuple> + </list> + </value> + </item> + <item> + <key> <string>stat_method</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> </value> </item> <item> @@ -457,6 +551,17 @@ <key> <string>title</string> </key> <value> <string>Accounting Transactions</string> </value> </item> + <item> + <key> <string>url_columns</string> </key> + <value> + <list> + <tuple> + <string>delivery_mirror_section_title_with_link</string> + <string>AccountingTransaction_getThirdPartyUrl</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>viewable_permission</string> </key> <value> @@ -527,4 +632,17 @@ </dictionary> </pickle> </record> + <record id="6" aka="AAAAAAAAAAY="> + <pickle> + <global name="Method" module="Products.Formulator.MethodField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>method_name</string> </key> + <value> <string>portal_catalog</string> </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_credit.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_credit.xml new file mode 100644 index 0000000000..80d957e47b --- /dev/null +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_credit.xml @@ -0,0 +1,293 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="FloatField" module="Products.Formulator.StandardFields"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>listbox_credit</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + <item> + <key> <string>not_float</string> </key> + <value> <string>You did not enter a floating point number.</string> </value> + </item> + <item> + <key> <string>required_not_found</string> </key> + <value> <string>Input is required but no input given.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> + <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>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string>figure</string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></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>input_style</string> </key> + <value> <string>-1 234.5</string> </value> + </item> + <item> + <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>Credit</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> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>cell/credit | cell/AccountingTransaction_getTotalCredit</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python:preferences.getPreference(\'preferred_money_quantity_style\', \'-1 234.5\')</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>request/precision | python:2</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_debit.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_debit.xml new file mode 100644 index 0000000000..223067e249 --- /dev/null +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_debit.xml @@ -0,0 +1,293 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="FloatField" module="Products.Formulator.StandardFields"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>listbox_debit</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + <item> + <key> <string>not_float</string> </key> + <value> <string>You did not enter a floating point number.</string> </value> + </item> + <item> + <key> <string>required_not_found</string> </key> + <value> <string>Input is required but no input given.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> + <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>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string>figure</string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></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>input_style</string> </key> + <value> <string>-1 234.5</string> </value> + </item> + <item> + <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>Debit</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> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>cell/debit | cell/AccountingTransaction_getTotalDebit</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python:preferences.getPreference(\'preferred_money_quantity_style\', \'-1 234.5\')</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>request/precision | python:2</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_delivery_mirror_section_title.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_delivery_mirror_section_title.xml new file mode 100644 index 0000000000..7c2c029d02 --- /dev/null +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_delivery_mirror_section_title.xml @@ -0,0 +1,275 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="StringField" module="Products.Formulator.StandardFields"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>listbox_delivery_mirror_section_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> + <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>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>Mirror Section</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> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>cell/delivery_mirror_section_title|cell/AccountingTransaction_getThirdPartyTitle</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_delivery_mirror_section_title_with_link.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_delivery_mirror_section_title_with_link.xml new file mode 100644 index 0000000000..10430a1be5 --- /dev/null +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_delivery_mirror_section_title_with_link.xml @@ -0,0 +1,275 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="StringField" module="Products.Formulator.StandardFields"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>listbox_delivery_mirror_section_title_with_link</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> + <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>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>Mirror Section</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> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>cell/delivery_mirror_section_title|cell/AccountingTransaction_getThirdPartyTitle</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_accounting_transaction_section_title.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_delivery_own_section_title.xml similarity index 99% rename from bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_accounting_transaction_section_title.xml rename to bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_delivery_own_section_title.xml index 5b00b41c6b..9da7a64d40 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_accounting_transaction_section_title.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_delivery_own_section_title.xml @@ -8,7 +8,7 @@ <dictionary> <item> <key> <string>id</string> </key> - <value> <string>listbox_accounting_transaction_section_title</string> </value> + <value> <string>listbox_delivery_own_section_title</string> </value> </item> <item> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_operation_date.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_operation_date.xml index e05274731f..a716358c9e 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_operation_date.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_operation_date.xml @@ -486,7 +486,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: cell.operation_date and cell.operation_date.toZone(cell.getObject().getStopDate().timezone())</string> </value> + <value> <string>python:(getattr(cell, \'section_mark\', \'\') ==\'source\' and cell.getStartDate()) or cell.getStopDate()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_total_net_price.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_total_net_price.xml new file mode 100644 index 0000000000..0c50d77583 --- /dev/null +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_total_net_price.xml @@ -0,0 +1,293 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="FloatField" module="Products.Formulator.StandardFields"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>listbox_total_net_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>not_float</string> </key> + <value> <string>You did not enter a floating point number.</string> </value> + </item> + <item> + <key> <string>required_not_found</string> </key> + <value> <string>Input is required but no input given.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string>figure</string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></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>input_style</string> </key> + <value> <string>-1 234.5</string> </value> + </item> + <item> + <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>Net Total Price</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> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: preferences.getPreference(\'preferred_money_quantity_field_width\', 10)</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python:preferences.getPreference(\'preferred_money_quantity_style\', \'-1 234.5\')</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: here.getQuantityPrecisionFromResource(cell.getPriceCurrency())</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml new file mode 100644 index 0000000000..52f4dd9804 --- /dev/null +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.xml @@ -0,0 +1,754 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="SQL" module="Products.ZSQLMethods.SQL"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_Use_Database_Methods_Permission</string> </key> + <value> + <list> + <string>Member</string> + </list> + </value> + </item> + <item> + <key> <string>allow_simple_one_argument_traversal</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>arguments_src</string> </key> + <value> <string>selection\r\n +selection_name=None\r\n +selection_domain\r\n +selection_report\r\n +selection_params=""\r\n +from_date=""\r\n +at_date=""\r\n +to_date=""\r\n +node=""\r\n +resource=""\r\n +entity=""\r\n +stat=""\r\n +omit_input=""\r\n +omit_output=""\r\n +amount=""\r\n +amount_range_min=""\r\n +amount_range_max=""\r\n +creation_date_range_min=""\r\n +creation_date_range_max=""\r\n +section_category=""\r\n +section_category_strict=""\r\n +count=""\r\n +transaction_uid=""\r\n +specific_reference\r\n +group_by\r\n +search_result_keys=\'\'\r\n +delivery_mirror_section_title=""\r\n +delivery_own_section_title=""\r\n +source_section_where_expression\r\n +destination_section_where_expression</string> </value> + </item> + <item> + <key> <string>cache_time_</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>class_file_</string> </key> + <value> <string>ZSQLCatalog.zsqlbrain</string> </value> + </item> + <item> + <key> <string>class_name_</string> </key> + <value> <string>ZSQLBrain</string> </value> + </item> + <item> + <key> <string>connection_hook</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>connection_id</string> </key> + <value> <string>erp5_sql_connection</string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>AccountingTransactionModule_zGetAccountingTransactionList</string> </value> + </item> + <item> + <key> <string>max_cache_</string> </key> + <value> <int>100</int> </value> + </item> + <item> + <key> <string>max_rows_</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>src</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +<dtml-let query="portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery(**selection_params), select_expression_key=(\'operation_date\', \'specific_reference\', \'delivery_mirror_section_title\', \'delivery_own_section_title\'), **selection_params)">\n +<dtml-let search_result_keys="search_result_keys or portal_catalog.getCatalogSearchResultKeys()">\n +<dtml-let use_movement_table="from_date or to_date or at_date or resource or stat or amount or amount_range_min or amount_range_max">\n +<dtml-let accounting_movement_list="portal_url.getPortalObject().getPortalAccountingMovementTypeList()">\n +\n +\n +<dtml-comment>\n +#################################################\n +# #\n +# If both entity and section_category are NOT #\n +# #\n +#################################################\n +</dtml-comment>\n +<dtml-if "not (entity or section_category)">\n + SELECT\n + <dtml-if stat>\n + SUM(stock.total_price) AS total_price\n + <dtml-elif count>\n + COUNT(DISTINCT catalog.uid) AS count\n + <dtml-else>\n + <dtml-if "query[\'select_expression\']">\n + <dtml-var "query[\'select_expression\']">\n + <dtml-in "search_result_keys">,<dtml-var sequence-item></dtml-in>\n + , delivery.start_date as operation_date\n + , \'source\' as section_mark\n + , catalog.reference as specific_reference\n + <dtml-else>\n + DISTINCT\n + <dtml-in "search_result_keys">\n + <dtml-unless sequence-start>,</dtml-unless>\n + <dtml-var sequence-item>\n + </dtml-in>\n + , delivery.start_date as operation_date\n + , \'source\' as section_mark\n + , catalog.reference as specific_reference\n + </dtml-if>\n + </dtml-if>\n + \n + FROM\n + <dtml-in prefix="table" expr="query[\'from_table_list\']">\n + <dtml-if "table_key not in (\'delivery\', \'catalog\')">\n + <dtml-var table_item> AS <dtml-var table_key>,\n + </dtml-if>\n + </dtml-in>\n + <dtml-if selection_domain>\n + <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)">,\n + </dtml-if>\n + <dtml-if selection_report>\n + <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)">,\n + </dtml-if>\n + <dtml-if use_movement_table> movement, </dtml-if>\n + <dtml-if "stat or omit_input or omit_output or node">\n + stock, catalog as child,\n + <dtml-unless section_category>category,</dtml-unless>\n + </dtml-if>\n + <dtml-if "section_category">category, catalog as section, </dtml-if>\n + catalog,\n + delivery\n + \n + WHERE\n + delivery.uid = catalog.uid\n + <dtml-if "query[\'where_expression\']">\n + AND <dtml-var "query[\'where_expression\']">\n + </dtml-if>\n + <dtml-if selection_domain>\n + AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain)">\n + </dtml-if>\n + <dtml-if selection_report>\n + AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1)">\n + </dtml-if>\n + <dtml-if specific_reference> AND (\n + catalog.source_reference LIKE\n + <dtml-sqlvar specific_reference type="string">\n + OR catalog.destination_reference LIKE\n + <dtml-sqlvar specific_reference type="string"> )</dtml-if>\n + <dtml-if transaction_uid>\n + AND catalog.uid = <dtml-var transaction_uid> </dtml-if>\n + <dtml-if amount>\n + AND ABS(movement.quantity) = <dtml-sqlvar amount type="float">\n + </dtml-if>\n + <dtml-if amount_range_min>\n + AND ABS(movement.quantity) >= <dtml-sqlvar amount_range_min type="float">\n + </dtml-if>\n + <dtml-if amount_range_max>\n + AND ABS(movement.quantity) < <dtml-sqlvar amount_range_max type="float">\n + </dtml-if>\n + <dtml-if creation_date_range_min>\n + AND catalog.creation_date >=\n + <dtml-sqlvar creation_date_range_min type="datetime"> </dtml-if>\n + <dtml-if creation_date_range_max>\n + AND catalog.creation_date <\n + <dtml-sqlvar "creation_date_range_max+1" type="datetime"> </dtml-if>\n + <dtml-if use_movement_table>\n + AND movement.is_accountable\n + AND movement.explanation_uid = catalog.uid </dtml-if>\n + <dtml-if resource> AND movement.resource_uid =\n + <dtml-var "restrictedTraverse(resource).getUid()"> </dtml-if>\n + <dtml-if entity> AND (\n + delivery.destination_section_uid =\n + <dtml-var "restrictedTraverse(entity).getUid()">\n + OR delivery.source_section_uid =\n + <dtml-var "restrictedTraverse(entity).getUid()">\n + )</dtml-if>\n + <dtml-if section_category> AND (\n + ( category.uid = delivery.destination_section_uid\n + ) OR ( category.uid = delivery.source_section_uid ) )\n + AND section.portal_type = "Organisation"\n + AND section.uid = category.uid\n + AND category.category_uid =\n + <dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n + <dtml-if "section_category_strict">AND category.category_strict_membership = 1</dtml-if>\n + </dtml-if>\n + \n + <dtml-if from_date>\n + AND delivery.start_date >= <dtml-sqlvar from_date type="datetime">\n + </dtml-if>\n + <dtml-if to_date>\n + AND delivery.start_date <= <dtml-sqlvar expr="to_date+1" type="datetime">\n + </dtml-if>\n + <dtml-if at_date>\n + AND delivery.start_date < <dtml-sqlvar at_date type="datetime">\n + </dtml-if>\n + \n + <dtml-if node>\n + <dtml-if stat>\n + AND stock.uid IN (\n + SELECT child.uid from catalog as child\n + WHERE category.uid = stock.section_uid\n + AND child.parent_uid = catalog.uid\n + HAVING (SELECT count(stock.uid) from stock, catalog as child\n + WHERE stock.uid = child.uid \n + AND child.parent_uid = catalog.uid\n + AND (\n + <dtml-in node>\n + <dtml-unless sequence-start>OR</dtml-unless>\n + stock.node_uid =\n + <dtml-var "restrictedTraverse(_[\'sequence-item\']).getUid()">\n + </dtml-in> )\n + )\n + )\n + <dtml-else>\n + AND category.uid = stock.section_uid\n + AND child.uid = stock.uid\n + AND child.parent_uid = catalog.uid\n + AND (\n + <dtml-in node>\n + <dtml-unless sequence-start>OR</dtml-unless>\n + stock.node_uid =\n + <dtml-var "restrictedTraverse(_[\'sequence-item\']).getUid()">\n + </dtml-in> )\n + </dtml-if>\n + </dtml-if>\n + \n + <dtml-if stat>\n + AND category.uid = stock.section_uid\n + AND child.uid = stock.uid\n + AND child.parent_uid = catalog.uid\n + AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>\n + <dtml-if omit_input> AND stock.total_price < 0\n + AND stock.uid = movement.uid\n + </dtml-if>\n + <dtml-if omit_output> AND stock.total_price > 0\n + AND stock.uid = movement.uid\n + </dtml-if>\n + </dtml-if>\n + <dtml-if expr="selection_name is not None and portal_selections.getSelectionInvertModeFor(selection_name) and len(portal_selections.getSelectionInvertModeUidListFor(selection_name)) > 0">\n + AND ( 0 = 1\n + <dtml-in expr="portal_selections.getSelectionInvertModeUidListFor(selection_name)">\n + OR catalog.uid = <dtml-var sequence-item>\n + </dtml-in>\n + )\n + </dtml-if>\n + \n + <dtml-unless count>\n + <dtml-if "query[\'order_by_expression\']">\n + ORDER BY <dtml-var "query[\'order_by_expression\']">\n + </dtml-if>\n + <dtml-if "query[\'limit_expression\']">\n + LIMIT <dtml-var "query[\'limit_expression\']">\n + </dtml-if>\n + </dtml-unless>\n +\n +</dtml-if>\n +\n +\n +\n +\n +<dtml-comment>\n +#################################################\n +# #\n +# If entity or section_category IS EXISTS #\n +# #\n +#################################################\n +</dtml-comment>\n +<dtml-if "entity or section_category">\n +\n + <dtml-if stat>\n + SELECT SUM(total_price) AS total_price FROM (\n + SELECT DISTINCT total_price, uid FROM (\n + <dtml-elif count>\n + SELECT COUNT(DISTINCT uid) AS count FROM (\n + <dtml-else>\n + SELECT\n + <dtml-if "query[\'select_expression\']">\n + <dtml-var "query[\'select_expression\']">\n + <dtml-in "search_result_keys">,<dtml-var sequence-item></dtml-in>\n + <dtml-else>\n + catalog.*,\n + ( SELECT title FROM catalog as mirror_catalog WHERE mirror_catalog.uid=catalog.delivery_mirror_section_uid ) AS delivery_mirror_section_title,\n + ( SELECT title FROM catalog as own_catalog WHERE own_catalog.uid=catalog.delivery_own_section_uid ) AS delivery_own_section_title,\n + ( SELECT IFNULL(SUM(stock.total_price), 0) FROM stock, catalog AS child WHERE child.uid = stock.uid AND child.parent_uid = catalog.uid AND stock.section_uid=catalog.category_uid AND stock.total_price > 0 AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>) AS debit,\n + ( SELECT IFNULL(-SUM(stock.total_price), 0) FROM stock, catalog AS child WHERE child.uid = stock.uid AND child.parent_uid = catalog.uid AND stock.section_uid=catalog.category_uid AND stock.total_price < 0 AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>) AS credit\n + </dtml-if>\n + FROM (\n + SELECT *\n + FROM (\n + </dtml-if>\n +\n +<dtml-comment>\n + ##################\n + # #\n + # Source Section #\n + # #\n + ##################\n +</dtml-comment>\n +\n + (\n + SELECT\n + <dtml-if stat>\n + stock.total_price, child.uid\n + <dtml-elif count>\n + catalog.uid\n + <dtml-else>\n + DISTINCT\n + delivery.start_date as operation_date\n + , delivery.destination_section_uid as delivery_mirror_section_uid\n + , delivery.source_section_uid as delivery_own_section_uid\n + , \'source\' as section_mark\n + , catalog.source_reference as specific_reference\n + , catalog.*\n + <dtml-if "section_category">, category.uid as category_uid</dtml-if>\n + <dtml-if "not (stat or count) and query[\'order_by_expression\']">\n + <dtml-in "query[\'order_by_expression\'].split(\', \')">\n + <dtml-unless "\'operation_date\' in _[\'sequence-item\'] or \'specific_reference\' in _[\'sequence-item\'] or \'`catalog`.\' in _[\'sequence-item\']">\n + , <dtml-var expr="_[\'sequence-item\'].split(\' \')[0]">\n + </dtml-unless>\n + </dtml-in>\n + </dtml-if>\n + </dtml-if>\n + \n + FROM\n + <dtml-in prefix="table" expr="query[\'from_table_list\']">\n + <dtml-if "table_key not in (\'delivery\', \'catalog\')">\n + <dtml-var table_item> AS <dtml-var table_key>,\n + </dtml-if>\n + </dtml-in>\n + <dtml-if selection_domain>\n + <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)">,\n + </dtml-if>\n + <dtml-if selection_report>\n + <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)">,\n + </dtml-if>\n + <dtml-if use_movement_table> movement, </dtml-if>\n + <dtml-if "stat or omit_input or omit_output or node">\n + stock, catalog as child, </dtml-if>\n + <dtml-if "section_category">category, catalog as section, </dtml-if>\n + <dtml-if "delivery_mirror_section_title">delivery AS mirror_section_delivery, catalog AS mirror_section_catalog,</dtml-if>\n + <dtml-if "delivery_own_section_title">delivery AS own_section_delivery, catalog AS own_section_catalog,</dtml-if>\n + catalog,\n + delivery\n + \n + WHERE\n + delivery.uid = catalog.uid\n + <dtml-if "query[\'where_expression\']">\n + AND <dtml-var "query[\'where_expression\']">\n + </dtml-if>\n + <dtml-if source_section_where_expression>\n + AND <dtml-var source_section_where_expression>\n + </dtml-if>\n + <dtml-if selection_domain>\n + AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain)">\n + </dtml-if>\n + <dtml-if selection_report>\n + AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1)">\n + </dtml-if>\n + <dtml-if specific_reference>\n + AND catalog.source_reference LIKE <dtml-sqlvar specific_reference type="string">\n + </dtml-if>\n + <dtml-if transaction_uid>\n + AND catalog.uid = <dtml-var transaction_uid> </dtml-if>\n + <dtml-if "amount or amount_range_min or amount_range_max">\n + AND EXISTS\n + (SELECT * FROM stock, catalog as child WHERE\n + stock.uid=child.uid AND child.parent_uid=catalog.uid AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>\n + <dtml-if amount>\n + AND <dtml-sqltest amount column="ABS(stock.total_price)" type=float op=eq>\n + </dtml-if>\n + <dtml-if amount_range_min>\n + AND <dtml-sqltest amount_range_min column="ABS(stock.total_price)" type=float op=ge>\n + </dtml-if>\n + <dtml-if amount_range_max>\n + AND <dtml-sqltest amount_range_max column="ABS(stock.total_price)" type=float op=lt>\n + </dtml-if>\n + )\n + </dtml-if>\n + <dtml-if creation_date_range_min>\n + AND catalog.creation_date >=\n + <dtml-sqlvar creation_date_range_min type="datetime"> </dtml-if>\n + <dtml-if creation_date_range_max>\n + AND catalog.creation_date <\n + <dtml-sqlvar "creation_date_range_max+1" type="datetime"> </dtml-if>\n + <dtml-if use_movement_table>\n + AND movement.is_accountable\n + AND movement.explanation_uid = catalog.uid </dtml-if>\n + <dtml-if resource> AND movement.resource_uid =\n + <dtml-var "restrictedTraverse(resource).getUid()"> </dtml-if>\n + -- SOURCE SECTION!!!!!\n + <dtml-if entity>\n + AND delivery.destination_section_uid =<dtml-var "restrictedTraverse(entity).getUid()">\n + </dtml-if>\n + <dtml-if section_category>\n + AND category.uid = delivery.source_section_uid\n + AND section.portal_type = "Organisation"\n + AND section.uid = category.uid\n + AND category.category_uid =\n + <dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n + <dtml-if "section_category_strict">AND category.category_strict_membership = 1</dtml-if>\n + </dtml-if>\n + <dtml-if "delivery_mirror_section_title">\n + AND mirror_section_catalog.uid = mirror_section_delivery.destination_section_uid\n + AND mirror_section_delivery.uid = catalog.uid\n + AND <dtml-sqltest delivery_mirror_section_title type=string op=like column=mirror_section_catalog.title>\n + </dtml-if>\n + <dtml-if "delivery_own_section_title">\n + AND own_section_catalog.uid = own_section_delivery.source_section_uid\n + AND own_section_delivery.uid = catalog.uid\n + AND <dtml-sqltest delivery_own_section_title type=string op=like column=own_section_catalog.title>\n + </dtml-if>\n + \n + <dtml-if from_date>\n + AND delivery.start_date >= <dtml-sqlvar from_date type="datetime">\n + </dtml-if>\n + <dtml-if to_date>\n + AND delivery.start_date <= <dtml-sqlvar expr="to_date.latestTime()" type="datetime">\n + </dtml-if>\n + <dtml-if at_date>\n + AND delivery.start_date < <dtml-sqlvar at_date type="datetime">\n + </dtml-if>\n + \n + <dtml-if node>\n + <dtml-if stat>\n + AND stock.uid IN (\n + SELECT child.uid from catalog as child\n + WHERE category.uid = stock.section_uid\n + AND child.parent_uid = catalog.uid\n + HAVING (SELECT count(stock.uid) from stock, catalog as child\n + WHERE stock.uid = child.uid \n + AND child.parent_uid = catalog.uid\n + AND (\n + <dtml-in node>\n + <dtml-unless sequence-start>OR</dtml-unless>\n + stock.node_uid =\n + <dtml-var "restrictedTraverse(_[\'sequence-item\']).getUid()">\n + </dtml-in> )\n + )\n + )\n + <dtml-else>\n + AND category.uid = stock.section_uid\n + AND child.uid = stock.uid\n + AND child.parent_uid = catalog.uid\n + AND (\n + <dtml-in node>\n + <dtml-unless sequence-start>OR</dtml-unless>\n + stock.node_uid =\n + <dtml-var "restrictedTraverse(_[\'sequence-item\']).getUid()">\n + </dtml-in> )\n + </dtml-if>\n + </dtml-if>\n + \n + <dtml-if stat>\n + AND category.uid = stock.section_uid\n + AND child.uid = stock.uid\n + AND child.parent_uid = catalog.uid\n + AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>\n + <dtml-if omit_input> AND stock.total_price < 0\n + AND stock.uid = movement.uid\n + </dtml-if>\n + <dtml-if omit_output> AND stock.total_price > 0\n + AND stock.uid = movement.uid\n + </dtml-if>\n + </dtml-if>\n + <dtml-if expr="selection_name is not None and portal_selections.getSelectionInvertModeFor(selection_name) and len(portal_selections.getSelectionInvertModeUidListFor(selection_name)) > 0">\n + AND ( 0 = 1\n + <dtml-in expr="portal_selections.getSelectionInvertModeUidListFor(selection_name)">\n + OR catalog.uid = <dtml-var sequence-item>\n + </dtml-in>\n + )\n + </dtml-if>\n +\n + <dtml-if "not (count or stat) and query[\'limit_expression\'] and query[\'limit_expression\'].startswith(\'0\')">\n + <dtml-if "query[\'order_by_expression\']">\n + ORDER BY <dtml-var "query[\'order_by_expression\']">\n + </dtml-if>\n + LIMIT <dtml-var "query[\'limit_expression\']">\n + </dtml-if>\n + )\n +\n +\n +\n +UNION\n +\n +\n +\n +<dtml-comment>\n + #######################\n + # #\n + # Destination Section #\n + # #\n + #######################\n +</dtml-comment>\n +\n + (\n + SELECT\n + <dtml-if stat>\n + stock.total_price, child.uid\n + <dtml-elif count>\n + catalog.uid\n + <dtml-else>\n + DISTINCT\n + delivery.stop_date as operation_date\n + , delivery.source_section_uid as delivery_mirror_section_uid\n + , delivery.destination_section_uid as delivery_own_section_uid\n + , \'destination\' as section_mark\n + , catalog.destination_reference as specific_reference\n + , catalog.*\n + <dtml-if "section_category">, category.uid as category_uid</dtml-if>\n + <dtml-if "not (stat or count) and query[\'order_by_expression\']">\n + <dtml-in "query[\'order_by_expression\'].split(\', \')">\n + <dtml-unless "\'operation_date\' in _[\'sequence-item\'] or \'specific_reference\' in _[\'sequence-item\'] or \'`catalog`.\' in _[\'sequence-item\']">\n + , <dtml-var expr="_[\'sequence-item\'].split(\' \')[0]">\n + </dtml-unless>\n + </dtml-in>\n + </dtml-if>\n + </dtml-if>\n + \n + FROM\n + <dtml-in prefix="table" expr="query[\'from_table_list\']">\n + <dtml-if "table_key not in (\'delivery\', \'catalog\')">\n + <dtml-var table_item> AS <dtml-var table_key>,\n + </dtml-if>\n + </dtml-in>\n + <dtml-if selection_domain>\n + <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)">,\n + </dtml-if>\n + <dtml-if selection_report>\n + <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)">,\n + </dtml-if>\n + <dtml-if use_movement_table> movement, </dtml-if>\n + <dtml-if "stat or omit_input or omit_output or node">\n + stock, catalog as child, </dtml-if>\n + <dtml-if "section_category">category, catalog as section, </dtml-if>\n + <dtml-if "delivery_mirror_section_title">delivery AS mirror_section_delivery, catalog AS mirror_section_catalog,</dtml-if>\n + <dtml-if "delivery_own_section_title">delivery AS own_section_delivery, catalog AS own_section_catalog,</dtml-if>\n + catalog,\n + delivery\n + \n + WHERE\n + delivery.uid = catalog.uid\n + <dtml-if "query[\'where_expression\']">\n + AND <dtml-var "query[\'where_expression\']">\n + </dtml-if>\n + <dtml-if destination_section_where_expression>\n + AND <dtml-var destination_section_where_expression>\n + </dtml-if>\n + <dtml-if selection_domain>\n + AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain)">\n + </dtml-if>\n + <dtml-if selection_report>\n + AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1)">\n + </dtml-if>\n + <dtml-if specific_reference>\n + AND catalog.destination_reference LIKE <dtml-sqlvar specific_reference type="string">\n + </dtml-if>\n + <dtml-if transaction_uid>\n + AND catalog.uid = <dtml-var transaction_uid> </dtml-if>\n + <dtml-if "amount or amount_range_min or amount_range_max">\n + AND EXISTS\n + (SELECT * FROM stock, catalog as child WHERE\n + stock.uid=child.uid AND child.parent_uid=catalog.uid AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>\n + <dtml-if amount>\n + AND <dtml-sqltest amount column="ABS(stock.total_price)" type=float op=eq>\n + </dtml-if>\n + <dtml-if amount_range_min>\n + AND <dtml-sqltest amount_range_min column="ABS(stock.total_price)" type=float op=ge>\n + </dtml-if>\n + <dtml-if amount_range_max>\n + AND <dtml-sqltest amount_range_max column="ABS(stock.total_price)" type=float op=lt>\n + </dtml-if>\n + )\n + </dtml-if>\n + <dtml-if creation_date_range_min>\n + AND catalog.creation_date >=\n + <dtml-sqlvar creation_date_range_min type="datetime"> </dtml-if>\n + <dtml-if creation_date_range_max>\n + AND catalog.creation_date <\n + <dtml-sqlvar "creation_date_range_max+1" type="datetime"> </dtml-if>\n + <dtml-if use_movement_table>\n + AND movement.is_accountable\n + AND movement.explanation_uid = catalog.uid </dtml-if>\n + <dtml-if resource> AND movement.resource_uid =\n + <dtml-var "restrictedTraverse(resource).getUid()"> </dtml-if>\n + -- DESTINATION SECTION!!!!!\n + <dtml-if entity>\n + AND delivery.source_section_uid = <dtml-var "restrictedTraverse(entity).getUid()">\n + </dtml-if>\n + <dtml-if section_category>\n + AND category.uid = delivery.destination_section_uid\n + AND section.portal_type = "Organisation"\n + AND section.uid = category.uid\n + AND category.category_uid =\n + <dtml-var "portal_categories.restrictedTraverse(section_category).getUid()">\n + <dtml-if "section_category_strict">AND category.category_strict_membership = 1</dtml-if>\n + </dtml-if>\n + <dtml-if "delivery_mirror_section_title">\n + AND mirror_section_catalog.uid = mirror_section_delivery.source_section_uid\n + AND mirror_section_delivery.uid = catalog.uid\n + AND <dtml-sqltest delivery_mirror_section_title type=string op=like column=mirror_section_catalog.title>\n + </dtml-if>\n + <dtml-if "delivery_own_section_title">\n + AND own_section_catalog.uid = own_section_delivery.destination_section_uid\n + AND own_section_delivery.uid = catalog.uid\n + AND <dtml-sqltest delivery_own_section_title type=string op=like column=own_section_catalog.title>\n + </dtml-if>\n +\n + <dtml-if from_date>\n + AND delivery.stop_date >= <dtml-sqlvar from_date type="datetime">\n + </dtml-if>\n + <dtml-if to_date>\n + AND delivery.stop_date <= <dtml-sqlvar expr="to_date.latestTime()" type="datetime">\n + </dtml-if>\n + <dtml-if at_date>\n + AND delivery.stop_date < <dtml-sqlvar at_date type="datetime">\n + </dtml-if>\n + \n + <dtml-if node>\n + <dtml-if stat>\n + AND stock.uid IN (\n + SELECT child.uid from catalog as child\n + WHERE category.uid = stock.section_uid\n + AND child.parent_uid = catalog.uid\n + HAVING (SELECT count(stock.uid) from stock, catalog as child\n + WHERE stock.uid = child.uid \n + AND child.parent_uid = catalog.uid\n + AND (\n + <dtml-in node>\n + <dtml-unless sequence-start>OR</dtml-unless>\n + stock.node_uid =\n + <dtml-var "restrictedTraverse(_[\'sequence-item\']).getUid()">\n + </dtml-in> )\n + )\n + )\n + <dtml-else>\n + AND category.uid = stock.section_uid\n + AND child.uid = stock.uid\n + AND child.parent_uid = catalog.uid\n + AND (\n + <dtml-in node>\n + <dtml-unless sequence-start>OR</dtml-unless>\n + stock.node_uid =\n + <dtml-var "restrictedTraverse(_[\'sequence-item\']).getUid()">\n + </dtml-in> )\n + </dtml-if>\n + </dtml-if>\n + \n + <dtml-if stat>\n + AND category.uid = stock.section_uid\n + AND child.uid = stock.uid\n + AND child.parent_uid = catalog.uid\n + AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>\n + <dtml-if omit_input> AND stock.total_price < 0\n + AND stock.uid = movement.uid\n + </dtml-if>\n + <dtml-if omit_output> AND stock.total_price > 0\n + AND stock.uid = movement.uid\n + </dtml-if>\n + </dtml-if>\n + <dtml-if expr="selection_name is not None and portal_selections.getSelectionInvertModeFor(selection_name) and len(portal_selections.getSelectionInvertModeUidListFor(selection_name)) > 0">\n + AND ( 0 = 1\n + <dtml-in expr="portal_selections.getSelectionInvertModeUidListFor(selection_name)">\n + OR catalog.uid = <dtml-var sequence-item>\n + </dtml-in>\n + )\n + </dtml-if>\n +\n + <dtml-if "not (count or stat) and query[\'limit_expression\'] and query[\'limit_expression\'].startswith(\'0\')">\n + <dtml-if "query[\'order_by_expression\']">\n + ORDER BY <dtml-var "query[\'order_by_expression\']">\n + </dtml-if>\n + LIMIT <dtml-var "query[\'limit_expression\']">\n + </dtml-if>\n +\n + )\n +\n +\n +<dtml-comment>\n + ##################\n + # #\n + # ORDER, LIMIT #\n + # #\n + ##################\n +</dtml-comment>\n +\n +\n + <dtml-if "count">\n + ) as catalog\n + <dtml-elif "stat">\n + ) as sb\n + ) as catalog\n + <dtml-else>\n + ) as catalog\n + </dtml-if>\n +\n + <dtml-if "not (stat or count)">\n + GROUP BY uid\n + <dtml-if "query[\'order_by_expression\']">\n + ORDER BY\n + <dtml-in "query[\'order_by_expression\'].split(\', \')">\n + <dtml-if "\'.\' in _[\'sequence-item\']">\n + <dtml-var expr="_[\'sequence-item\'].split(\'.\')[1]">\n + <dtml-else>\n + <dtml-var sequence-item>\n + </dtml-if><dtml-unless sequence-end>,</dtml-unless>\n + </dtml-in>\n + </dtml-if>\n + <dtml-if "query[\'limit_expression\']">\n + LIMIT <dtml-var "query[\'limit_expression\']">\n + </dtml-if>\n + ) as catalog\n + <dtml-if expr="query[\'group_by_expression\']">\n + GROUP BY <dtml-var expr="query[\'group_by_expression\']">\n + </dtml-if>\n +\n + </dtml-if>\n +\n +</dtml-if>\n +</dtml-let></dtml-let></dtml-let></dtml-let>\n +\n +<dtml-comment> vim: syntax=dtml\n +</dtml-comment>\n + + +]]></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index 8fc21d8edb..ddd0a93e2c 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -1527 \ No newline at end of file +1529 \ No newline at end of file diff --git a/bt5/erp5_accounting/bt/template_catalog_method_id_list b/bt5/erp5_accounting/bt/template_catalog_method_id_list index f382ed2c0d..59acddcada 100644 --- a/bt5/erp5_accounting/bt/template_catalog_method_id_list +++ b/bt5/erp5_accounting/bt/template_catalog_method_id_list @@ -1,11 +1,2 @@ -erp5_mysql_innodb/z0_drop_accounting_transaction -erp5_mysql_innodb/z0_uncatalog_accounting_transaction -erp5_mysql_innodb/z_catalog_accounting_transaction_list -erp5_mysql_innodb/z_create_accounting_transaction -erp5_mysql_innodb/z_related_accounting_transaction_mirror_section -erp5_mysql_innodb/z_related_accounting_transaction_payment -erp5_mysql_innodb/z_related_accounting_transaction_project -erp5_mysql_innodb/z_related_accounting_transaction_section -erp5_mysql_innodb/z_related_accounting_transaction_stock_line erp5_mysql_innodb/z_related_preferred_gap erp5_mysql_innodb/z_related_strict_membership_preferred_gap \ No newline at end of file diff --git a/bt5/erp5_accounting/bt/template_catalog_related_key_list b/bt5/erp5_accounting/bt/template_catalog_related_key_list index dcde7ac950..8618c43a71 100644 --- a/bt5/erp5_accounting/bt/template_catalog_related_key_list +++ b/bt5/erp5_accounting/bt/template_catalog_related_key_list @@ -1,8 +1,2 @@ preferred_gap_id | category,catalog/id/z_related_preferred_gap -preferred_gap_strict_membership_id | category,catalog/id/z_related_strict_membership_preferred_gap -accounting_transaction_mirror_section_title | catalog/title/z_related_accounting_transaction_mirror_section -accounting_transaction_section_title | catalog/title/z_related_accounting_transaction_section -accounting_transaction_project_title | catalog/title/z_related_accounting_transaction_project -accounting_transaction_payment_title | catalog/title/z_related_accounting_transaction_payment -accounting_transaction_line_node_uid | stock/node_uid/z_related_accounting_transaction_stock_line -accounting_transaction_line_total_price | stock/total_price/z_related_accounting_transaction_stock_line \ No newline at end of file +preferred_gap_strict_membership_id | category,catalog/id/z_related_strict_membership_preferred_gap \ No newline at end of file diff --git a/bt5/erp5_accounting/CatalogDateTimeKeyTemplateItem/datetime_key_list.xml b/bt5/erp5_accounting_alternate_catalog/CatalogDateTimeKeyTemplateItem/datetime_key_list.xml similarity index 100% rename from bt5/erp5_accounting/CatalogDateTimeKeyTemplateItem/datetime_key_list.xml rename to bt5/erp5_accounting_alternate_catalog/CatalogDateTimeKeyTemplateItem/datetime_key_list.xml diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_accounting_transaction.catalog_keys.xml b/bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_accounting_transaction.catalog_keys.xml similarity index 100% rename from bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_accounting_transaction.catalog_keys.xml rename to bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_accounting_transaction.catalog_keys.xml diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_accounting_transaction.xml b/bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_accounting_transaction.xml similarity index 100% rename from bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_accounting_transaction.xml rename to bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_accounting_transaction.xml diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_accounting_transaction.catalog_keys.xml b/bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_accounting_transaction.catalog_keys.xml similarity index 100% rename from bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_accounting_transaction.catalog_keys.xml rename to bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_accounting_transaction.catalog_keys.xml diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_accounting_transaction.xml b/bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_accounting_transaction.xml similarity index 100% rename from bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_accounting_transaction.xml rename to bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_accounting_transaction.xml diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_accounting_transaction_list.catalog_keys.xml b/bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_accounting_transaction_list.catalog_keys.xml similarity index 100% rename from bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_accounting_transaction_list.catalog_keys.xml rename to bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_accounting_transaction_list.catalog_keys.xml diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_accounting_transaction_list.xml b/bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_accounting_transaction_list.xml similarity index 100% rename from bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_accounting_transaction_list.xml rename to bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_accounting_transaction_list.xml diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_accounting_transaction.catalog_keys.xml b/bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_accounting_transaction.catalog_keys.xml similarity index 100% rename from bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_accounting_transaction.catalog_keys.xml rename to bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_accounting_transaction.catalog_keys.xml diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_accounting_transaction.xml b/bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_accounting_transaction.xml similarity index 100% rename from bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_accounting_transaction.xml rename to bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_accounting_transaction.xml diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_mirror_section.catalog_keys.xml b/bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_mirror_section.catalog_keys.xml similarity index 100% rename from bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_mirror_section.catalog_keys.xml rename to bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_mirror_section.catalog_keys.xml diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_mirror_section.xml b/bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_mirror_section.xml similarity index 100% rename from bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_mirror_section.xml rename to bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_mirror_section.xml diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_payment.catalog_keys.xml b/bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_payment.catalog_keys.xml similarity index 100% rename from bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_payment.catalog_keys.xml rename to bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_payment.catalog_keys.xml diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_payment.xml b/bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_payment.xml similarity index 100% rename from bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_payment.xml rename to bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_payment.xml diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_project.catalog_keys.xml b/bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_project.catalog_keys.xml similarity index 100% rename from bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_project.catalog_keys.xml rename to bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_project.catalog_keys.xml diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_project.xml b/bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_project.xml similarity index 100% rename from bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_project.xml rename to bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_project.xml diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_stock_line.catalog_keys.xml b/bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_stock_line.catalog_keys.xml similarity index 100% rename from bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_stock_line.catalog_keys.xml rename to bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_stock_line.catalog_keys.xml diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_stock_line.xml b/bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_stock_line.xml similarity index 100% rename from bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_stock_line.xml rename to bt5/erp5_accounting_alternate_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_stock_line.xml diff --git a/bt5/erp5_accounting_alternate_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml b/bt5/erp5_accounting_alternate_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml new file mode 100644 index 0000000000..3d062c922c --- /dev/null +++ b/bt5/erp5_accounting_alternate_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml @@ -0,0 +1,7 @@ +<key_list> + <key>accounting_transaction_line_node_uid | stock/node_uid/z_related_accounting_transaction_stock_line</key> + <key>accounting_transaction_line_total_price | stock/total_price/z_related_accounting_transaction_stock_line</key> + <key>accounting_transaction_mirror_section_title | catalog/title/z_related_accounting_transaction_mirror_section</key> + <key>accounting_transaction_payment_title | catalog/title/z_related_accounting_transaction_payment</key> + <key>accounting_transaction_project_title | catalog/title/z_related_accounting_transaction_project</key> +</key_list> \ No newline at end of file diff --git a/bt5/erp5_accounting/CatalogResultTableTemplateItem/result_table_list.xml b/bt5/erp5_accounting_alternate_catalog/CatalogResultTableTemplateItem/result_table_list.xml similarity index 100% rename from bt5/erp5_accounting/CatalogResultTableTemplateItem/result_table_list.xml rename to bt5/erp5_accounting_alternate_catalog/CatalogResultTableTemplateItem/result_table_list.xml diff --git a/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog.xml b/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog.xml new file mode 100644 index 0000000000..2082fc3ce9 --- /dev/null +++ b/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog.xml @@ -0,0 +1,47 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="Folder" module="OFS.Folder"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_local_properties</string> </key> + <value> + <tuple> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>business_template_skin_layer_priority</string> </value> + </item> + <item> + <key> <string>type</string> </key> + <value> <string>float</string> </value> + </item> + </dictionary> + </tuple> + </value> + </item> + <item> + <key> <string>_objects</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>business_template_skin_layer_priority</string> </key> + <value> <float>10.0</float> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>erp5_accounting_alternate_catalog</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_getAccountingTransactionList.xml b/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_getAccountingTransactionList.xml new file mode 100644 index 0000000000..79c21d4499 --- /dev/null +++ b/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_getAccountingTransactionList.xml @@ -0,0 +1,177 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>Script_magic</string> </key> + <value> <int>3</int> </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>portal = context.getPortalObject()\n +getUid = portal.portal_categories.getCategoryUid\n +\n +section_category = params.pop(\'section_category\', None)\n +section_category_strict = params.pop(\'section_category_strict\', None)\n +params[\'accounting_transaction.section_uid\'] = \'\'\n +if section_category:\n + params[\'accounting_transaction.section_uid\'] = context.Base_getSectionUidListForSectionCategory(\n + section_category, strict_membership=section_category_strict)\n +\n +# rewrite payment_mode_relative_url to uid\n +payment_mode_relative_url = params.pop(\'payment_mode_relative_url\', None)\n +if payment_mode_relative_url:\n + params[\'default_payment_mode_uid\'] = \\\n + portal.portal_categories.payment_mode.getCategoryUid(payment_mode_relative_url)\n +\n +# rewrite currency to uid\n +resource = params.pop(\'resource\', None)\n +if resource:\n + params[\'accounting_transaction.resource_uid\'] = getUid(resource)\n +\n +\n +# XXX wrong name compat\n +# TODO: make it better on search dialog\n +node_list = params.pop(\'node\', None)\n +if node_list:\n + params[\'accounting_transaction_line_node_uid\'] = [\n + getUid(node) for node in node_list]\n +\n +entity = params.pop(\'entity\', None)\n +if entity:\n + params[\'accounting_transaction.mirror_section_uid\'] = getUid(entity)\n +\n +if not params.get(\'operation_date\'):\n + params.pop(\'from_date\', None)\n + params.pop(\'to_date\', None)\n + if from_date or to_date:\n + if from_date:\n + if to_date:\n + params[\'operation_date\'] = dict(\n + query=(from_date, to_date),\n + range=\'minngt\')\n + else:\n + params[\'operation_date\'] = dict(\n + query=(from_date, ),\n + range=\'min\')\n + else:\n + params[\'operation_date\'] = dict(\n + query=(to_date, ),\n + range=\'ngt\')\n + \n +amount = params.pop(\'amount\', \'\')\n +if amount not in (None, \'\'):\n + params[\'accounting_transaction_line_total_price\'] = amount\n +else:\n + amount_range_min = params.pop(\'amount_range_min\', None)\n + amount_range_max = params.pop(\'amount_range_max\', None)\n + if amount_range_min or amount_range_max:\n + if amount_range_min:\n + if amount_range_max:\n + params[\'accounting_transaction_line_total_price\'] = dict(\n + query=(amount_range_min, amount_range_max),\n + range=\'minmax\')\n + else:\n + params[\'accounting_transaction_line_total_price\'] = dict(\n + query=(amount_range_min, ),\n + range=\'min\')\n + else:\n + params[\'accounting_transaction_line_total_price\'] = dict(\n + query=(amount_range_max, ),\n + range=\'max\')\n +\n +\n +creation_date_range_min = params.pop(\'creation_date_range_min\', None)\n +creation_date_range_max = params.pop(\'creation_date_range_max\', None)\n +if creation_date_range_min or creation_date_range_max:\n + if creation_date_range_min:\n + if creation_date_range_max:\n + params[\'creation_date\'] = dict(\n + query=(creation_date_range_min, creation_date_range_max),\n + range=\'minmax\')\n + else:\n + params[\'creation_date\'] = dict(\n + query=(creation_date_range_min, ),\n + range=\'min\')\n + else:\n + params[\'creation_date\'] = dict(\n + query=(creation_date_range_max, ),\n + range=\'max\')\n +\n +select_dict = params.get(\'select_dict\') or dict()\n +select_dict.update(dict(total_debit=None,\n + total_credit=None,\n + reference=None,\n + specific_reference=None,\n + project_uid=None,\n + payment_uid=None,\n + mirror_section_uid=None,\n + operation_date=None))\n +\n +params[\'select_dict\'] = select_dict\n +\n +# We group by uid to really filter duplicated lines, but this makes generated\n +# query much slower, and in reality duplicated lines are transactions for which\n +# both source section and destination section match the criterions. This can be\n +# because there are no criterion on section_uid or because both sections are members\n +# of the selected group. In the later it can be accepted as not a problem.\n +if not params.get(\'accounting_transaction.section_uid\'):\n + params.setdefault(\'group_by\', (\'uid\',))\n +\n +return context.searchFolder(**params)\n +</string> </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string>from_date=None, to_date=None, **params</string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>AccountingTransactionModule_getAccountingTransactionList</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList.xml b/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList.xml new file mode 100644 index 0000000000..e735d27342 --- /dev/null +++ b/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList.xml @@ -0,0 +1,159 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="ERP5Form" module="Products.ERP5Form.Form"/> + </pickle> + <pickle> + <dictionary> + <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/> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>_objects</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>action</string> </key> + <value> <string>Base_doSelect</string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>edit_order</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>encoding</string> </key> + <value> <string>UTF-8</string> </value> + </item> + <item> + <key> <string>enctype</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>group_list</string> </key> + <value> + <list> + <string>left</string> + <string>right</string> + <string>center</string> + <string>bottom</string> + <string>hidden</string> + </list> + </value> + </item> + <item> + <key> <string>groups</string> </key> + <value> + <dictionary> + <item> + <key> <string>bottom</string> </key> + <value> + <list> + <string>listbox</string> + </list> + </value> + </item> + <item> + <key> <string>center</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> + <list> + <string>listbox_total_credit</string> + <string>listbox_total_debit</string> + <string>listbox_accounting_transaction_mirror_section_title</string> + <string>listbox_accounting_transaction_payment_title</string> + <string>listbox_accounting_transaction_project_title</string> + <string>listbox_operation_date</string> + </list> + </value> + </item> + <item> + <key> <string>left</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>right</string> </key> + <value> + <list/> + </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>AccountingTransactionModule_viewAccountingTransactionList</string> </value> + </item> + <item> + <key> <string>method</string> </key> + <value> <string>POST</string> </value> + </item> + <item> + <key> <string>name</string> </key> + <value> <string>AccountingTransactionModule_viewAccountingTransactionList</string> </value> + </item> + <item> + <key> <string>pt</string> </key> + <value> <string>form_list</string> </value> + </item> + <item> + <key> <string>row_length</string> </key> + <value> <int>4</int> </value> + </item> + <item> + <key> <string>stored_encoding</string> </key> + <value> <string>UTF-8</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Accounting Transactions</string> </value> + </item> + <item> + <key> <string>unicode_mode</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>update_action</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>update_action_title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml b/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml new file mode 100644 index 0000000000..b4cba15c0e --- /dev/null +++ b/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml @@ -0,0 +1,265 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>all_columns</string> + <string>columns</string> + <string>count_method</string> + <string>editable_columns</string> + <string>search_columns</string> + <string>sort</string> + <string>sort_columns</string> + <string>stat_method</string> + <string>url_columns</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>listbox</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>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>all_columns</string> </key> + <value> + <list> + <tuple> + <string>translated_portal_type</string> + <string>Type</string> + </tuple> + <tuple> + <string>reference</string> + <string>Invoice Number</string> + </tuple> + <tuple> + <string>source_reference</string> + <string>Source Reference</string> + </tuple> + <tuple> + <string>destination_reference</string> + <string>Destination Reference</string> + </tuple> + <tuple> + <string>accounting_transaction_project_title</string> + <string>Project</string> + </tuple> + <tuple> + <string>accounting_transaction_payment_title</string> + <string>Section Bank Account</string> + </tuple> + <tuple> + <string>creation_date</string> + <string>Creation Date</string> + </tuple> + <tuple> + <string>modification_date</string> + <string>Modification Date</string> + </tuple> + <tuple> + <string>total_price</string> + <string>Total Price</string> + </tuple> + <tuple> + <string>total_net_price</string> + <string>Total Net Price</string> + </tuple> + <tuple> + <string>causality_title</string> + <string>Packing List</string> + </tuple> + <tuple> + <string>translated_causality_state_title</string> + <string>Causality State</string> + </tuple> + <tuple> + <string>owner_title</string> + <string>Owner</string> + </tuple> + <tuple> + <string>creation_date</string> + <string>Creation Date</string> + </tuple> + <tuple> + <string>modification_date</string> + <string>Modification Date</string> + </tuple> + </list> + </value> + </item> + <item> + <key> <string>columns</string> </key> + <value> + <list> + <tuple> + <string>title</string> + <string>Title</string> + </tuple> + <tuple> + <string>accounting_transaction_mirror_section_title</string> + <string>Third Party</string> + </tuple> + <tuple> + <string>translated_portal_type</string> + <string>Transaction Type</string> + </tuple> + <tuple> + <string>operation_date</string> + <string>Accounting Operation Date</string> + </tuple> + <tuple> + <string>reference</string> + <string>Document Reference</string> + </tuple> + <tuple> + <string>specific_reference</string> + <string>Transaction Reference</string> + </tuple> + <tuple> + <string>translated_simulation_state_title</string> + <string>State</string> + </tuple> + <tuple> + <string>total_debit</string> + <string>Debit</string> + </tuple> + <tuple> + <string>total_credit</string> + <string>Credit</string> + </tuple> + </list> + </value> + </item> + <item> + <key> <string>count_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable_columns</string> </key> + <value> + <list> + <tuple> + <string>total_debit</string> + <string>Debit</string> + </tuple> + <tuple> + <string>total_credit</string> + <string>Credit</string> + </tuple> + <tuple> + <string>operation_date</string> + <string>operation_date</string> + </tuple> + <tuple> + <string>accounting_transaction_mirror_section_title</string> + <string>accounting_transaction_mirror_section_title</string> + </tuple> + </list> + </value> + </item> + <item> + <key> <string>field_id</string> </key> + <value> <string>listbox</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList</string> </value> + </item> + <item> + <key> <string>search_columns</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>sort</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>sort_columns</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>stat_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> + </item> + <item> + <key> <string>url_columns</string> </key> + <value> + <list/> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_accounting_transaction_mirror_section_title.xml b/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList/listbox_accounting_transaction_mirror_section_title.xml similarity index 100% rename from bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_accounting_transaction_mirror_section_title.xml rename to bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList/listbox_accounting_transaction_mirror_section_title.xml diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_accounting_transaction_payment_title.xml b/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList/listbox_accounting_transaction_payment_title.xml similarity index 100% rename from bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_accounting_transaction_payment_title.xml rename to bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList/listbox_accounting_transaction_payment_title.xml diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_accounting_transaction_project_title.xml b/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList/listbox_accounting_transaction_project_title.xml similarity index 100% rename from bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_accounting_transaction_project_title.xml rename to bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList/listbox_accounting_transaction_project_title.xml diff --git a/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList/listbox_operation_date.xml b/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList/listbox_operation_date.xml new file mode 100644 index 0000000000..e05274731f --- /dev/null +++ b/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList/listbox_operation_date.xml @@ -0,0 +1,2045 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="DateTimeField" module="Products.Formulator.StandardFields"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>listbox_operation_date</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>datetime_out_of_range</string> </key> + <value> <string>The date and time you entered were out of range.</string> </value> + </item> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + <item> + <key> <string>not_datetime</string> </key> + <value> <string>You did not enter a valid date and time.</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>allow_empty_time</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>ampm_time_style</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>date_only</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>date_separator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default_now</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>end_datetime</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden_day_is_last_day</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hide_day</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_order</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>start_datetime</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>time_separator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>sub_form</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>allow_empty_time</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>ampm_time_style</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>date_only</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>date_separator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>default_now</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>end_datetime</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden_day_is_last_day</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hide_day</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_order</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>start_datetime</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>time_separator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>timezone_style</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>allow_empty_time</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>ampm_time_style</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>date_only</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>date_separator</string> </key> + <value> <string>/</string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>default_now</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </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_datetime</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>hidden_day_is_last_day</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>hide_day</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>input_order</string> </key> + <value> <string>ymd</string> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string>text</string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>start_datetime</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>time_separator</string> </key> + <value> <string>:</string> </value> + </item> + <item> + <key> <string>timezone_style</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Accounting Operation Date</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.Form</string> + <string>BasicForm</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>action</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>encoding</string> </key> + <value> <string>UTF-8</string> </value> + </item> + <item> + <key> <string>enctype</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>fields</string> </key> + <value> + <dictionary> + <item> + <key> <string>ampm</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent> + </value> + </item> + <item> + <key> <string>day</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> + </value> + </item> + <item> + <key> <string>hour</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent> + </value> + </item> + <item> + <key> <string>minute</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent> + </value> + </item> + <item> + <key> <string>month</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent> + </value> + </item> + <item> + <key> <string>year</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAo=</string> </persistent> + </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>group_list</string> </key> + <value> + <list> + <string>Default</string> + <string>date</string> + <string>time</string> + </list> + </value> + </item> + <item> + <key> <string>groups</string> </key> + <value> + <dictionary> + <item> + <key> <string>Default</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>date</string> </key> + <value> + <list> + <string>year</string> + <string>month</string> + <string>day</string> + </list> + </value> + </item> + <item> + <key> <string>time</string> </key> + <value> + <list> + <string>hour</string> + <string>minute</string> + <string>ampm</string> + </list> + </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>method</string> </key> + <value> <string>POST</string> </value> + </item> + <item> + <key> <string>name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>stored_encoding</string> </key> + <value> <string>ISO-8859-1</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Basic Form</string> </value> + </item> + <item> + <key> <string>unicode_mode</string> </key> + <value> <int>0</int> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: cell.operation_date and cell.operation_date.toZone(cell.getObject().getStopDate().timezone())</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>preferences/getPreferredDateOrder | string:ymd</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="5" aka="AAAAAAAAAAU="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.StandardFields</string> + <string>StringField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>ampm</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> <int>2</int> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>2</int> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <int>2</int> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>am/pm</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> + <record id="6" aka="AAAAAAAAAAY="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.StandardFields</string> + <string>IntegerField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>day</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> <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>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> <int>2</int> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>2</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></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>Day</string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>0</int> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="7" aka="AAAAAAAAAAc="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.StandardFields</string> + <string>IntegerField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>hour</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> <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>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> <int>2</int> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>2</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></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>Hour</string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>0</int> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="8" aka="AAAAAAAAAAg="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.StandardFields</string> + <string>IntegerField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>minute</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> <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>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> <int>2</int> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>2</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></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>Minute</string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>0</int> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="9" aka="AAAAAAAAAAk="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.StandardFields</string> + <string>IntegerField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>month</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> <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>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> <int>2</int> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>2</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></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>Month</string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>0</int> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="10" aka="AAAAAAAAAAo="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.StandardFields</string> + <string>IntegerField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>year</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> <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>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> <int>4</int> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>4</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></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>Year</string> </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_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_total_credit.xml b/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList/listbox_total_credit.xml similarity index 100% rename from bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_total_credit.xml rename to bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList/listbox_total_credit.xml diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_total_debit.xml b/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList/listbox_total_debit.xml similarity index 100% rename from bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_total_debit.xml rename to bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList/listbox_total_debit.xml diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Brain_getMirrorSectionTitle.xml b/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/Brain_getMirrorSectionTitle.xml similarity index 100% rename from bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Brain_getMirrorSectionTitle.xml rename to bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/Brain_getMirrorSectionTitle.xml diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Brain_getPaymentTitle.xml b/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/Brain_getPaymentTitle.xml similarity index 100% rename from bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Brain_getPaymentTitle.xml rename to bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/Brain_getPaymentTitle.xml diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Brain_getProjectTitle.xml b/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/Brain_getProjectTitle.xml similarity index 100% rename from bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Brain_getProjectTitle.xml rename to bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/Brain_getProjectTitle.xml diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InternalInvoiceTransaction_statInternalTransactionLineList.xml b/bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/InternalInvoiceTransaction_statInternalTransactionLineList.xml similarity index 100% rename from bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InternalInvoiceTransaction_statInternalTransactionLineList.xml rename to bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/InternalInvoiceTransaction_statInternalTransactionLineList.xml diff --git a/bt5/erp5_accounting_alternate_catalog/bt/description b/bt5/erp5_accounting_alternate_catalog/bt/description new file mode 100644 index 0000000000..8a4ffb563d --- /dev/null +++ b/bt5/erp5_accounting_alternate_catalog/bt/description @@ -0,0 +1 @@ +Alternate catalog implementation of accounting module main view \ No newline at end of file diff --git a/bt5/erp5_accounting_alternate_catalog/bt/revision b/bt5/erp5_accounting_alternate_catalog/bt/revision new file mode 100644 index 0000000000..7813681f5b --- /dev/null +++ b/bt5/erp5_accounting_alternate_catalog/bt/revision @@ -0,0 +1 @@ +5 \ No newline at end of file diff --git a/bt5/erp5_accounting/bt/template_catalog_datetime_key_list b/bt5/erp5_accounting_alternate_catalog/bt/template_catalog_datetime_key_list similarity index 100% rename from bt5/erp5_accounting/bt/template_catalog_datetime_key_list rename to bt5/erp5_accounting_alternate_catalog/bt/template_catalog_datetime_key_list diff --git a/bt5/erp5_accounting_alternate_catalog/bt/template_catalog_method_id_list b/bt5/erp5_accounting_alternate_catalog/bt/template_catalog_method_id_list new file mode 100644 index 0000000000..fc3ce3792d --- /dev/null +++ b/bt5/erp5_accounting_alternate_catalog/bt/template_catalog_method_id_list @@ -0,0 +1,8 @@ +erp5_mysql_innodb/z0_drop_accounting_transaction +erp5_mysql_innodb/z0_uncatalog_accounting_transaction +erp5_mysql_innodb/z_catalog_accounting_transaction_list +erp5_mysql_innodb/z_create_accounting_transaction +erp5_mysql_innodb/z_related_accounting_transaction_mirror_section +erp5_mysql_innodb/z_related_accounting_transaction_payment +erp5_mysql_innodb/z_related_accounting_transaction_project +erp5_mysql_innodb/z_related_accounting_transaction_stock_line \ No newline at end of file diff --git a/bt5/erp5_accounting_alternate_catalog/bt/template_catalog_related_key_list b/bt5/erp5_accounting_alternate_catalog/bt/template_catalog_related_key_list new file mode 100644 index 0000000000..bc8d1329f8 --- /dev/null +++ b/bt5/erp5_accounting_alternate_catalog/bt/template_catalog_related_key_list @@ -0,0 +1,5 @@ +accounting_transaction_mirror_section_title | catalog/title/z_related_accounting_transaction_mirror_section +accounting_transaction_project_title | catalog/title/z_related_accounting_transaction_project +accounting_transaction_payment_title | catalog/title/z_related_accounting_transaction_payment +accounting_transaction_line_node_uid | stock/node_uid/z_related_accounting_transaction_stock_line +accounting_transaction_line_total_price | stock/total_price/z_related_accounting_transaction_stock_line \ No newline at end of file diff --git a/bt5/erp5_accounting/bt/template_catalog_result_table_list b/bt5/erp5_accounting_alternate_catalog/bt/template_catalog_result_table_list similarity index 100% rename from bt5/erp5_accounting/bt/template_catalog_result_table_list rename to bt5/erp5_accounting_alternate_catalog/bt/template_catalog_result_table_list diff --git a/bt5/erp5_accounting_alternate_catalog/bt/template_format_version b/bt5/erp5_accounting_alternate_catalog/bt/template_format_version new file mode 100644 index 0000000000..56a6051ca2 --- /dev/null +++ b/bt5/erp5_accounting_alternate_catalog/bt/template_format_version @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/bt5/erp5_accounting_alternate_catalog/bt/template_skin_id_list b/bt5/erp5_accounting_alternate_catalog/bt/template_skin_id_list new file mode 100644 index 0000000000..040ce592d5 --- /dev/null +++ b/bt5/erp5_accounting_alternate_catalog/bt/template_skin_id_list @@ -0,0 +1 @@ +erp5_accounting_alternate_catalog \ No newline at end of file diff --git a/bt5/erp5_accounting_alternate_catalog/bt/title b/bt5/erp5_accounting_alternate_catalog/bt/title new file mode 100644 index 0000000000..040ce592d5 --- /dev/null +++ b/bt5/erp5_accounting_alternate_catalog/bt/title @@ -0,0 +1 @@ +erp5_accounting_alternate_catalog \ No newline at end of file diff --git a/bt5/erp5_accounting_alternate_catalog/bt/version b/bt5/erp5_accounting_alternate_catalog/bt/version new file mode 100644 index 0000000000..ceab6e11ec --- /dev/null +++ b/bt5/erp5_accounting_alternate_catalog/bt/version @@ -0,0 +1 @@ +0.1 \ No newline at end of file diff --git a/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_setupStandardBT5.xml b/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_setupStandardBT5.xml index 893dc0cd3a..2e0d21182c 100644 --- a/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_setupStandardBT5.xml +++ b/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_setupStandardBT5.xml @@ -56,7 +56,6 @@ bt5_installation_list = (\'erp5_dhtml_style\',\n \'erp5_jquery_ui\',\n \'erp5_ingestion_mysql_innodb_catalog\',\n \'erp5_dms\',\n - \'erp5_accounting\',\n \'erp5_crm\',\n \'erp5_simplified_invoicing\',\n \'erp5_trade_knowledge_pad\',\n @@ -70,7 +69,7 @@ bt5_installation_list = (\'erp5_dhtml_style\',\n \'erp5_ooo_import\',\n )\n \n -bt5_update_catalog = (\'erp5_ingestion_mysql_innodb_catalog\', \'erp5_accounting\', )\n +bt5_update_catalog = (\'erp5_ingestion_mysql_innodb_catalog\', )\n \n for name in bt5_installation_list:\n configuration_save.addConfigurationItem("Standard BT5 Configurator Item",\n diff --git a/bt5/erp5_configurator_standard/bt/revision b/bt5/erp5_configurator_standard/bt/revision index b7f636c12f..ed4df3c909 100644 --- a/bt5/erp5_configurator_standard/bt/revision +++ b/bt5/erp5_configurator_standard/bt/revision @@ -1 +1 @@ -665 \ No newline at end of file +666 \ No newline at end of file diff --git a/product/ERP5Configurator/tests/ConfiguratorTestMixin.py b/product/ERP5Configurator/tests/ConfiguratorTestMixin.py index b627ca62dd..7f320cd253 100644 --- a/product/ERP5Configurator/tests/ConfiguratorTestMixin.py +++ b/product/ERP5Configurator/tests/ConfiguratorTestMixin.py @@ -70,7 +70,6 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase): 'erp5_jquery_ui', 'erp5_ingestion_mysql_innodb_catalog', 'erp5_dms', - 'erp5_accounting', 'erp5_crm', 'erp5_simplified_invoicing', 'erp5_trade_knowledge_pad', diff --git a/product/ERP5Type/tests/testFunctionalCore.py b/product/ERP5Type/tests/testFunctionalCore.py index cff1713dd3..be6d0fda6f 100644 --- a/product/ERP5Type/tests/testFunctionalCore.py +++ b/product/ERP5Type/tests/testFunctionalCore.py @@ -69,6 +69,12 @@ class TestZeleniumCore(ERP5TypeFunctionalTestCase): # manager user and continue other tests as a user created in # that test. 'erp5_web_ui_test', + + # Accounting Module list from erp5_accounting still uses movement table + # TODO: merge erp5_accounting_alternate_catalog in + # erp5_accounting and update those tests + # (erp5_accounting_alternate_catalog does not provide stat columns) + 'erp5_movement_table_catalog', ) def test_suite(): -- 2.30.9