Commit 25a48ffa authored by Gabriel Monnerat's avatar Gabriel Monnerat

Refactor script to remove slow query that is not not so intuitive for end users.

To display the list of possible accounts we include validated nodes and  nodes that have been previously used on accounting movements. We include 2, because we want the user to be able to issue a report on a node that has been used in the past and is now invalidated.

The problem with this approach is that such query is very slow, when there are a lot of Movements.

Then, with the commit only validated accounts will be considered
parent 7cc0c2a2
No related merge requests found
...@@ -63,42 +63,18 @@ def getAccountItemList(section_category,\n ...@@ -63,42 +63,18 @@ def getAccountItemList(section_category,\n
from_date,\n from_date,\n
lang):\n lang):\n
\n \n
def sorted(seq, key):\n account_list = [(\'\', \'\')]\n
seq = seq[::]\n
seq.sort(key=key)\n
return seq\n
\n
account_dict = dict()\n
for account in portal.account_module.searchFolder(\n for account in portal.account_module.searchFolder(\n
portal_type=\'Account\',\n portal_type=\'Account\',\n
validation_state=(\'validated\',), ):\n select_list=["relative_url"],\n
account = account.getObject()\n validation_state=(\'validated\',)):\n
\n account_list.append((\n
account_dict[account.getUid()] = [\n account.Account_getFormattedTitle(),\n
account.Account_getFormattedTitle(),\n account.relative_url,))\n
account.getRelativeUrl(), ]\n
\n
search_kw = dict(\n
portal_type=portal.getPortalAccountingMovementTypeList(),\n
ignore_group_by=True,\n
group_by_node=True,)\n
if from_date:\n
search_kw[\'from_date\'] = from_date\n
if section_category_strict:\n
search_kw[\'section_category_strict_membership\'] = section_category\n
else:\n
search_kw[\'section_category\'] = section_category\n
\n \n
# add to this the accounts that have been used in accounting transactions.\n account_list.sort(key=lambda x: x[0])\n
for brain in portal.portal_simulation.getCurrentInventoryList( **search_kw ):\n
if brain.node_uid and brain.node_uid not in account_dict:\n
account = portal.portal_catalog.getObject(brain.node_uid)\n
account_dict[brain.node_uid] = [\n
account.Account_getFormattedTitle(),\n
account.getRelativeUrl(), ]\n
\n \n
return [(\'\', \'\')] + sorted(account_dict.values(),\n return account_list\n
key=lambda item: item[0])\n
\n \n
getAccountItemList = CachingMethod(getAccountItemList,\n getAccountItemList = CachingMethod(getAccountItemList,\n
id=script.getId(),\n id=script.getId(),\n
......
1540 1541
\ No newline at end of file \ No newline at end of file
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