[Erp5-report] r38115 yusei - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_sk...

[nobody at svn.erp5.org]

Author: yusei
Date: Thu Sep  2 04:34:23 2010
New Revision: 38115

URL: http://svn.erp5.org?rev=38115&view=rev
Log:
2010-09-02 yusei
* Display account title to journal report. Displaying gap id only is not useful at least in Japan.

Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.xml
    erp5/trunk/bt5/erp5_accounting/bt/change_log
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.xml?rev=38115&r1=38114&r2=38115&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.xml [utf8] Thu Sep  2 04:34:23 2010
@@ -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.ge
                 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>

Modified: erp5/trunk/bt5/erp5_accounting/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/change_log?rev=38115&r1=38114&r2=38115&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/change_log [utf8] Thu Sep  2 04:34:23 2010
@@ -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.
 

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=38115&r1=38114&r2=38115&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Thu Sep  2 04:34:23 2010
@@ -1 +1 @@
-1343
\ No newline at end of file
+1344
\ No newline at end of file