diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.xml index 3a63922c2bc056bbdb3b6a8747ce4f8690d707bb..1456cacc2e16c6ddae2ef526412404503a06bd50 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.xml @@ -72,10 +72,9 @@ if project_uid:\n extra_kw[\'project_uid\'] = project_uid\n \n account_title_cache = dict()\n -def getAccountGapIdAndTitle(node_relative_url):\n +def getAccountId(node_relative_url):\n if node_relative_url not in account_title_cache:\n - account = portal.restrictedTraverse(node_relative_url)\n - title = \'%s %s\' % (account.Account_getGapId(gap_root=gap_root), account.getTitle())\n + title = portal.restrictedTraverse(node_relative_url).Account_getGapId(gap_root=gap_root)\n account_title_cache[node_relative_url] = title\n return account_title_cache[node_relative_url]\n \n @@ -156,7 +155,7 @@ for brain in portal.portal_simulation.getMovementHistoryList(\n specific_reference=specific_reference,\n parent_reference=transaction_reference,\n mirror_section_title=mirror_section_title,\n - node_title=getAccountGapIdAndTitle(brain.node_relative_url),\n + node_title=getAccountId(brain.node_relative_url),\n date=date,\n debit=debit,\n credit=credit,)\n @@ -245,7 +244,7 @@ return line_list\n <string>True</string> <string>None</string> <string>account_title_cache</string> - <string>getAccountGapIdAndTitle</string> + <string>getAccountId</string> <string>account_in_gap_root_cache</string> <string>isAccountInGapRoot</string> <string>displayed_transaction</string> diff --git a/bt5/erp5_accounting/bt/change_log b/bt5/erp5_accounting/bt/change_log index 6e67cdc12b0a41ee733d8bf69b49f6736b2b3cab..81ada87f3b1d7e755f389d56b451bd4ab523c1e0 100644 --- a/bt5/erp5_accounting/bt/change_log +++ b/bt5/erp5_accounting/bt/change_log @@ -1,3 +1,6 @@ +2010-09-08 yusei +Revert my change on AccountingTransactionModule_getJournalSectionLineList at 2010-09-02. + 2010-09-03 yusei * Add Base_getAccountingWorkflowId and Base_getTranslatedAccountingWorkflowStateItemList to make accounting workflow easier to customise. diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index d9684754b6c4d1289dc6490492f79be32220aabc..90dfef95162205cb73a4be4a8c277d5225e661f8 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -1345 \ No newline at end of file +1349 \ No newline at end of file