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

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Nov 23 14:49:09 2009
New Revision: 30810

URL: http://svn.erp5.org?rev=30810&view=rev
Log:
- fix the test for "omit balanced accounts"
- fix the ordering of fields in the report

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

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.xml?rev=30810&r1=30809&r2=30810&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.xml [utf8] Mon Nov 23 14:49:09 2009
@@ -135,11 +135,15 @@
         # don\'t show entities belonging to the group we are reporting\n
     if omit_balanced_accounts and (\n
             simulation_tool.getInventoryAssetPrice(\n
+                    section_category=section_category,\n
+                    at_date=at_date,\n
+                    simulation_state=simulation_state,\n
                     mirror_section_uid=party.uid,\n
                     node_category_strict_membership=(\n
                           \'account_type/asset/receivable\',\n
-                          # TODO: don\'t compare floats for equality ...\n
-                          \'account_type/liability/payable\')) == 0.):\n
+                          \'account_type/liability/payable\'),\n
+                    # TODO: don\'t compare floats for equality ...\n
+                    ) == 0.):\n
       pass\n
     else:\n
       title = o.getTitle()\n

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewOtherPartiesReport.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewOtherPartiesReport.xml?rev=30810&r1=30809&r2=30810&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewOtherPartiesReport.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewOtherPartiesReport.xml [utf8] Mon Nov 23 14:49:09 2009
@@ -92,14 +92,14 @@
                     <key> <string>left</string> </key>
                     <value>
                       <list>
+                        <string>your_section_category</string>
+                        <string>your_at_date</string>
+                        <string>your_simulation_state</string>
                         <string>your_omit_balanced_accounts</string>
                         <string>your_omit_empty_accounts</string>
                         <string>your_omit_grouped_references</string>
                         <string>your_entity_role</string>
-                        <string>your_at_date</string>
                         <string>your_gap_root</string>
-                        <string>your_section_category</string>
-                        <string>your_simulation_state</string>
                       </list>
                     </value>
                 </item>

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=30810&r1=30809&r2=30810&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Mon Nov 23 14:49:09 2009
@@ -1,1 +1,1 @@
-1052
+1054