The previous change in Base_zGetNotGroupedMovementList had a side-effect,...

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.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29132 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getNotGroupedAccountingTransactionList.xml

@@ -81,6 +81,7 @@ for brain in portal.Base_zGetNotGroupedMovementList(\n
                                 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

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_zGetNotGroupedMovementList.xml

@@ -181,11 +181,9 @@ Here, a group of movement means:\n
             <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 @@ Here, a group of movement means:\n
             <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 @@ Here, a group of movement means:\n
   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 @@ Here, a group of movement means:\n
             <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 @@ Here, a group of movement means:\n
             <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 @@ Here, a group of movement means:\n
   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>

bt5/erp5_accounting/bt/revision

-968
+970
\ No newline at end of file