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

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Sep 22 09:44:40 2009
New Revision: 29132

URL: http://svn.erp5.org?rev=29132&view=rev
Log:
The previous change in Base_zGetNotGroupedMovementList had a side-effect, portal_type parameter must always be passed, otherwise DTML will get it from the context using getattr, and you will always get in the acqusition chain an object with "portal_type" argument.

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

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getNotGroupedAccountingTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getNotGroupedAccountingTransactionList.xml?rev=29132&r1=29131&r2=29132&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getNotGroupedAccountingTransactionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getNotGroupedAccountingTransactionList.xml [utf8] Tue Sep 22 09:44:40 2009
@@ -81,6 +81,7 @@
                                 at_date=from_date - 1, # this is not to_date\n
                                 simulation_state=params[\'simulation_state\'],\n
                                 node_uid=[kw[\'node_uid\']],\n
+                                portal_type=portal.getPortalAccountingMovementTypeList(),\n
                                 section_uid=params[\'section_uid\']):\n
     \n
     # manually filter out not interesting lines\n

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_zGetNotGroupedMovementList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_zGetNotGroupedMovementList.xml?rev=29132&r1=29131&r2=29132&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_zGetNotGroupedMovementList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_zGetNotGroupedMovementList.xml [utf8] Tue Sep 22 09:44:40 2009
@@ -181,11 +181,9 @@
             <dtml-sqlvar sequence-item type="string">\n
          <dtml-unless sequence-end>, </dtml-unless> </dtml-in simulation_state> ) and\n
        </dtml-if>\n
-       <dtml-if portal_type>\n
         stock.portal_type in (<dtml-in portal_type>\n
             <dtml-sqlvar sequence-item type="string">\n
          <dtml-unless sequence-end>, </dtml-unless> </dtml-in portal_type> ) and\n
-       </dtml-if>\n
        <dtml-if section_uid>\n
         stock.section_uid in (<dtml-in section_uid><dtml-var sequence-item>\n
          <dtml-unless sequence-end>, </dtml-unless> </dtml-in section_uid> ) and\n
@@ -213,11 +211,9 @@
             <dtml-sqlvar sequence-item type="string">\n
          <dtml-unless sequence-end>, </dtml-unless> </dtml-in simulation_state> ) and\n
        </dtml-if>\n
-       <dtml-if portal_type>\n
         stock.portal_type in (<dtml-in portal_type>\n
             <dtml-sqlvar sequence-item type="string">\n
          <dtml-unless sequence-end>, </dtml-unless> </dtml-in portal_type> ) and\n
-       </dtml-if>\n
        <dtml-if section_uid>\n
         stock.section_uid in (<dtml-in section_uid><dtml-var sequence-item>\n
          <dtml-unless sequence-end>, </dtml-unless> </dtml-in section_uid> ) and\n
@@ -235,9 +231,7 @@
   HAVING max(stock_2.date) > <dtml-sqlvar "at_date" type="datetime">\n
 )\n
 \n
-ORDER BY mirror_section_title, date\n
-\n
-
+ORDER BY mirror_section_title, date
 
 ]]></string> </value>
         </item>
@@ -305,11 +299,9 @@
             <dtml-sqlvar sequence-item type="string">\n
          <dtml-unless sequence-end>, </dtml-unless> </dtml-in simulation_state> ) and\n
        </dtml-if>\n
-       <dtml-if portal_type>\n
         stock.portal_type in (<dtml-in portal_type>\n
             <dtml-sqlvar sequence-item type="string">\n
          <dtml-unless sequence-end>, </dtml-unless> </dtml-in portal_type> ) and\n
-       </dtml-if>\n
        <dtml-if section_uid>\n
         stock.section_uid in (<dtml-in section_uid><dtml-var sequence-item>\n
          <dtml-unless sequence-end>, </dtml-unless> </dtml-in section_uid> ) and\n
@@ -337,11 +329,9 @@
             <dtml-sqlvar sequence-item type="string">\n
          <dtml-unless sequence-end>, </dtml-unless> </dtml-in simulation_state> ) and\n
        </dtml-if>\n
-       <dtml-if portal_type>\n
         stock.portal_type in (<dtml-in portal_type>\n
             <dtml-sqlvar sequence-item type="string">\n
          <dtml-unless sequence-end>, </dtml-unless> </dtml-in portal_type> ) and\n
-       </dtml-if>\n
        <dtml-if section_uid>\n
         stock.section_uid in (<dtml-in section_uid><dtml-var sequence-item>\n
          <dtml-unless sequence-end>, </dtml-unless> </dtml-in section_uid> ) and\n
@@ -359,9 +349,7 @@
   HAVING max(stock_2.date) > <dtml-sqlvar "at_date" type="datetime">\n
 )\n
 \n
-ORDER BY mirror_section_title, date\n
-\n
-
+ORDER BY mirror_section_title, date
 
 ]]></string> </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=29132&r1=29131&r2=29132&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Tue Sep 22 09:44:40 2009
@@ -1,1 +1,1 @@
-968
+970