[Erp5-report] r14205 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Apr 24 23:21:11 2007
New Revision: 14205

URL: http://svn.erp5.org?rev=14205&view=rev
Log:
Don't show simulation state column if user selected only one simulation_state in the dialog

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

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml?rev=14205&r1=14204&r2=14205&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml Tue Apr 24 23:21:11 2007
@@ -68,7 +68,9 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>"""Get the report sections for general ledger\n
+            <value> <string encoding="cdata"><![CDATA[
+
+"""Get the report sections for general ledger\n
 """\n
 from Products.ERP5Form.Report import ReportSection\n
 request  = context.REQUEST\n
@@ -114,7 +116,8 @@
 \n
 result = []\n
 \n
-account_columns = (\n
+if len(simulation_state) > 1:\n
+  account_columns = (\n
       (\'Movement_getSpecificReference\', \'Reference\'),\n
       (\'Movement_getExplanationTitle\', \'Title\'),\n
       (\'date\', \'Date\'),\n
@@ -122,6 +125,17 @@
       (\'Movement_getExplanationReference\', \'Invoice Number\'),\n
       (\'Movement_getMirrorSectionTitle\', \'Third Party\'),\n
       (\'getTranslatedSimulationStateTitle\', \'State\'),\n
+      (\'debit\', \'Debit\'),\n
+      (\'credit\', \'Credit\'),\n
+      (\'running_total_price\', \'Net\'), )\n
+else:\n
+  account_columns = (\n
+      (\'Movement_getSpecificReference\', \'Reference\'),\n
+      (\'Movement_getExplanationTitle\', \'Title\'),\n
+      (\'date\', \'Date\'),\n
+      (\'Movement_getExplanationTranslatedPortalType\', \'Type\'),\n
+      (\'Movement_getExplanationReference\', \'Invoice Number\'),\n
+      (\'Movement_getMirrorSectionTitle\', \'Third Party\'),\n
       (\'debit\', \'Debit\'),\n
       (\'credit\', \'Credit\'),\n
       (\'running_total_price\', \'Net\'), )\n
@@ -255,7 +269,9 @@
               selection_params=total_params))\n
 \n
 return result\n
-</string> </value>
+
+
+]]></string> </value>
         </item>
         <item>
             <key> <string>_code</string> </key>
@@ -326,6 +342,7 @@
                             <string>dict</string>
                             <string>params</string>
                             <string>result</string>
+                            <string>len</string>
                             <string>account_columns</string>
                             <string>gap_value_list</string>
                             <string>cat</string>
@@ -337,7 +354,6 @@
                             <string>strict_account_list</string>
                             <string>skip_branch</string>
                             <string>account</string>
-                            <string>len</string>
                             <string>_apply_</string>
                             <string>third_party_brain</string>
                             <string>third_party_params</string>

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=14205&r1=14204&r2=14205&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Tue Apr 24 23:21:11 2007
@@ -1,1 +1,1 @@
-283
+284