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 ce2599f2a77a7d982e56f04cfef06db93e3fc700..3a63922c2bc056bbdb3b6a8747ce4f8690d707bb 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 @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - <tuple/> - </tuple> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> </pickle> <pickle> <dictionary> @@ -75,9 +72,10 @@ if project_uid:\n extra_kw[\'project_uid\'] = project_uid\n \n account_title_cache = dict()\n -def getAccountId(node_relative_url):\n +def getAccountGapIdAndTitle(node_relative_url):\n if node_relative_url not in account_title_cache:\n - title = portal.restrictedTraverse(node_relative_url).Account_getGapId(gap_root=gap_root)\n + account = portal.restrictedTraverse(node_relative_url)\n + title = \'%s %s\' % (account.Account_getGapId(gap_root=gap_root), account.getTitle())\n account_title_cache[node_relative_url] = title\n return account_title_cache[node_relative_url]\n \n @@ -158,7 +156,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=getAccountId(brain.node_relative_url),\n + node_title=getAccountGapIdAndTitle(brain.node_relative_url),\n date=date,\n debit=debit,\n credit=credit,)\n @@ -247,7 +245,7 @@ return line_list\n <string>True</string> <string>None</string> <string>account_title_cache</string> - <string>getAccountId</string> + <string>getAccountGapIdAndTitle</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 d363935bf18d61e5a64e960e4f0c7df66e559e4f..3d7e0956a44baa67967d4abc92f292170008c88d 100644 --- a/bt5/erp5_accounting/bt/change_log +++ b/bt5/erp5_accounting/bt/change_log @@ -1,3 +1,6 @@ +2010-09-02 yusei +* Display account title to journal report. Displaying gap id only is not useful at least in Japan. + 2010-08-23 yusei * Allow users to change section on line level. This is sometimes needed. Use case: expense happens at section A, corresponding payment is done at section B. This is journalized in single transaction document. diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index 3bc9696c430c653478a0a97d91aa544d40d35977..4e98696eb77c4d5a63d27c229401794f48461f7d 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -1343 \ No newline at end of file +1344 \ No newline at end of file