Skip to content

erp5
erp5
Commit 9d6a8c4e authored by Arnaud Fontaine's avatar Arnaud Fontaine
Browse files
Options

P-S: Revert "Merge erp5_accounting_alternate_catalog in erp5_accounting" 

This reverts commit 70a8e561 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
parent 6a8f2448
Expand all Show whitespace changes
Inline Side-by-side
Showing with 5132 additions and 171 deletions
bt5/erp5_accounting/CatalogRelatedKeyTemplateItem/related_key_list.xml
View file @ 9d6a8c4e
<key_list> <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_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>preferred_gap_strict_membership_id | category,catalog/id/z_related_strict_membership_preferred_gap</key>
</key_list> </key_list>
\ No newline at end of file
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_countAccountingTransactionList.xml
View file @ 9d6a8c4e
...@@ -50,13 +50,35 @@ ...@@ -50,13 +50,35 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>params[\'stat\'] = 1\n <value> <string>if kw.get(\'stat\', 0) :\n
return context.AccountingTransactionModule_getAccountingTransactionList(**params)\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> </string> </value>
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>**params</string> </value> <value> <string>brain=None, selection=None, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList.xml
View file @ 9d6a8c4e
...@@ -50,125 +50,63 @@ ...@@ -50,125 +50,63 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>portal = context.getPortalObject()\n <value> <string encoding="cdata"><![CDATA[
getUid = portal.portal_categories.getCategoryUid\n
# 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 \n
section_category = params.pop(\'section_category\', None)\n if \'node\' not in params:\n
section_category_strict = params.pop(\'section_category_strict\', None)\n params[\'node\'] = []\n
params[\'accounting_transaction.section_uid\'] = \'\'\n if \'resource\' not in params:\n
if section_category:\n params[\'resource\'] = []\n
params[\'accounting_transaction.section_uid\'] = context.Base_getSectionUidListForSectionCategory(\n if \'from_date\' not in params:\n
section_category, strict_membership=section_category_strict)\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 \n
# rewrite payment_mode_relative_url to uid\n if params.get(\'stat\', 0):\n
payment_mode_relative_url = params.pop(\'payment_mode_relative_url\', None)\n params[\'stat\'] = 0\n
if payment_mode_relative_url:\n if params.get(\'count\', 0):\n
params[\'default_payment_mode_uid\'] = \\\n params[\'count\'] = 0\n
portal.portal_categories.payment_mode.getCategoryUid(payment_mode_relative_url)\n params[\'omit_input\'] = 0\n
params[\'omit_output\'] = 0\n
\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
params[\'source_section_where_expression\'] = \'\'\n
params[\'destination_section_where_expression\'] = \'\'\n
\n \n
# XXX wrong name compat\n if (params.get(\'operation_date\') or {}).get(\'query\'):\n
# TODO: make it better on search dialog\n buildSQLQuery = context.portal_catalog.buildSQLQuery\n
node_list = params.pop(\'node\', None)\n params[\'source_section_where_expression\'] = buildSQLQuery(\n
if node_list:\n **{\'delivery.start_date\': params[\'operation_date\']})[\'where_expression\']\n
params[\'accounting_transaction_line_node_uid\'] = [\n params[\'destination_section_where_expression\'] = buildSQLQuery(\n
getUid(node) for node in node_list]\n **{\'delivery.stop_date\': params[\'operation_date\']})[\'where_expression\']\n
del params[\'operation_date\']\n
\n \n
entity = params.pop(\'entity\', None)\n
if entity:\n
params[\'accounting_transaction.mirror_section_uid\'] = getUid(entity)\n
\n \n
if not params.get(\'operation_date\'):\n # this method can be used to build another complex query, for example\n
params.pop(\'from_date\', None)\n # as a catalog.parent_uid filter with SimulationTool.getMovementList.\n
params.pop(\'to_date\', None)\n # In this example, you can use side independant inventory API with \n
if from_date or to_date:\n # accounting module selection. see erp5_accounting_l10n_fr_m9 for an example.\n
if from_date:\n # ... XXX no this is deprecated\n
if to_date:\n src__ = context.REQUEST.other.get(\'src__\', 0)\n
params[\'operation_date\'] = dict(\n search_result_keys = context.REQUEST.other.get(\'search_result_keys\', None)\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
\n return context.AccountingTransactionModule_zGetAccountingTransactionList( \n
creation_date_range_min = params.pop(\'creation_date_range_min\', None)\n selection_params=params,\n
creation_date_range_max = params.pop(\'creation_date_range_max\', None)\n src__=src__,\n
if creation_date_range_min or creation_date_range_max:\n search_result_keys=search_result_keys,\n
if creation_date_range_min:\n **params)\n
if creation_date_range_max:\n
params[\'creation_date\'] = dict(\n
query=(creation_date_range_min, creation_date_range_max),\n ]]></string> </value>
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>
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <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>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList.xml
View file @ 9d6a8c4e
...@@ -70,14 +70,14 @@ ...@@ -70,14 +70,14 @@
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <value>
<list> <list>
<string>listbox_total_price</string> <string>listbox_credit</string>
<string>listbox_accounting_transaction_section_title</string> <string>listbox_debit</string>
<string>listbox_accounting_transaction_mirror_section_title</string> <string>listbox_delivery_mirror_section_title</string>
<string>listbox_accounting_transaction_payment_title</string>
<string>listbox_accounting_transaction_project_title</string>
<string>listbox_operation_date</string> <string>listbox_operation_date</string>
<string>listbox_total_credit</string> <string>listbox_delivery_mirror_section_title_with_link</string>
<string>listbox_total_debit</string> <string>listbox_total_net_price</string>
<string>listbox_total_price</string>
<string>listbox_delivery_own_section_title</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_accounting_transaction_section_title.xml → bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_delivery_own_section_title.xml
View file @ 9d6a8c4e
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <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>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox_operation_date.xml
View file @ 9d6a8c4e
...@@ -486,7 +486,7 @@ ...@@ -486,7 +486,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <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> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_accounting/bt/revision
View file @ 9d6a8c4e
1527 1529
\ No newline at end of file \ No newline at end of file
bt5/erp5_accounting/bt/template_catalog_method_id_list
View file @ 9d6a8c4e
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_preferred_gap
erp5_mysql_innodb/z_related_strict_membership_preferred_gap erp5_mysql_innodb/z_related_strict_membership_preferred_gap
\ No newline at end of file
bt5/erp5_accounting/bt/template_catalog_related_key_list
View file @ 9d6a8c4e
preferred_gap_id | category,catalog/id/z_related_preferred_gap preferred_gap_id | category,catalog/id/z_related_preferred_gap
preferred_gap_strict_membership_id | category,catalog/id/z_related_strict_membership_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
bt5/erp5_accounting_alternate_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml 0 → 100644
View file @ 9d6a8c4e
<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
bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_accounting_transaction_section.xml → bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog.xml
View file @ 9d6a8c4e
...@@ -2,30 +2,40 @@ ...@@ -2,30 +2,40 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<global name="SQL" module="Products.ZSQLMethods.SQL"/> <global name="Folder" module="OFS.Folder"/>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>arguments_src</string> </key> <key> <string>_local_properties</string> </key>
<value> <string>table_0</string> </value> <value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>business_template_skin_layer_priority</string> </value>
</item> </item>
<item> <item>
<key> <string>connection_id</string> </key> <key> <string>type</string> </key>
<value> <string>erp5_sql_connection</string> </value> <value> <string>float</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>_objects</string> </key>
<value> <string>z_related_accounting_transaction_section</string> </value> <value>
<tuple/>
</value>
</item>
<item>
<key> <string>business_template_skin_layer_priority</string> </key>
<value> <float>10.0</float> </value>
</item> </item>
<item> <item>
<key> <string>src</string> </key> <key> <string>id</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string>erp5_accounting_alternate_catalog</string> </value>
accounting_transaction.section_uid = <dtml-var table_0>.uid\n
]]></string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_getAccountingTransactionList.xml 0 → 100644
View file @ 9d6a8c4e
<?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>
bt5/erp5_accounting_alternate_catalog/SkinTemplateItem/portal_skins/erp5_accounting_alternate_catalog/AccountingTransactionModule_viewAccountingTransactionList.xml 0 → 100644
View file @ 9d6a8c4e
<?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>
bt5/erp5_accounting_alternate_catalog/bt/description 0 → 100644
View file @ 9d6a8c4e
Alternate catalog implementation of accounting module main view
\ No newline at end of file
bt5/erp5_accounting_alternate_catalog/bt/template_catalog_method_id_list 0 → 100644
View file @ 9d6a8c4e
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
bt5/erp5_accounting_alternate_catalog/bt/template_catalog_related_key_list 0 → 100644
View file @ 9d6a8c4e
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
bt5/erp5_accounting_alternate_catalog/bt/template_skin_id_list 0 → 100644
View file @ 9d6a8c4e
erp5_accounting_alternate_catalog
\ No newline at end of file
bt5/erp5_accounting_alternate_catalog/bt/title 0 → 100644
View file @ 9d6a8c4e
erp5_accounting_alternate_catalog
\ No newline at end of file
bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_setupStandardBT5.xml
View file @ 9d6a8c4e
...@@ -56,7 +56,6 @@ bt5_installation_list = (\'erp5_dhtml_style\',\n ...@@ -56,7 +56,6 @@ bt5_installation_list = (\'erp5_dhtml_style\',\n
\'erp5_jquery_ui\',\n \'erp5_jquery_ui\',\n
\'erp5_ingestion_mysql_innodb_catalog\',\n \'erp5_ingestion_mysql_innodb_catalog\',\n
\'erp5_dms\',\n \'erp5_dms\',\n
\'erp5_accounting\',\n
\'erp5_crm\',\n \'erp5_crm\',\n
\'erp5_simplified_invoicing\',\n \'erp5_simplified_invoicing\',\n
\'erp5_trade_knowledge_pad\',\n \'erp5_trade_knowledge_pad\',\n
...@@ -70,7 +69,7 @@ bt5_installation_list = (\'erp5_dhtml_style\',\n ...@@ -70,7 +69,7 @@ bt5_installation_list = (\'erp5_dhtml_style\',\n
\'erp5_ooo_import\',\n \'erp5_ooo_import\',\n
)\n )\n
\n \n
bt5_update_catalog = (\'erp5_ingestion_mysql_innodb_catalog\', \'erp5_accounting\', )\n bt5_update_catalog = (\'erp5_ingestion_mysql_innodb_catalog\', )\n
\n \n
for name in bt5_installation_list:\n for name in bt5_installation_list:\n
configuration_save.addConfigurationItem("Standard BT5 Configurator Item",\n configuration_save.addConfigurationItem("Standard BT5 Configurator Item",\n
......
bt5/erp5_configurator_standard/bt/revision
View file @ 9d6a8c4e
665 666
\ No newline at end of file \ No newline at end of file
product/ERP5Configurator/tests/ConfiguratorTestMixin.py
View file @ 9d6a8c4e
...@@ -70,7 +70,6 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase): ...@@ -70,7 +70,6 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase):
'erp5_jquery_ui', 'erp5_jquery_ui',
'erp5_ingestion_mysql_innodb_catalog', 'erp5_ingestion_mysql_innodb_catalog',
'erp5_dms', 'erp5_dms',
'erp5_accounting',
'erp5_crm', 'erp5_crm',
'erp5_simplified_invoicing', 'erp5_simplified_invoicing',
'erp5_trade_knowledge_pad', 'erp5_trade_knowledge_pad',
......
product/ERP5Type/tests/testFunctionalCore.py
View file @ 9d6a8c4e
...@@ -69,6 +69,12 @@ class TestZeleniumCore(ERP5TypeFunctionalTestCase): ...@@ -69,6 +69,12 @@ class TestZeleniumCore(ERP5TypeFunctionalTestCase):
# manager user and continue other tests as a user created in # manager user and continue other tests as a user created in
# that test. # that test.
'erp5_web_ui_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(): def test_suite():
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7