* Base_zGetNotGroupedMovementList:

- support portal_type parameter
- node_uid must now be passed as a list. This is incompatible API change
* Account_getNotGroupedAccountingTransactionList:
- update for new Base_zGetNotGroupedMovementList API (and remove no longer applicable XXXs)

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

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

@@ -80,11 +80,7 @@ line_list = []\n
 for brain in portal.Base_zGetNotGroupedMovementList(\n
                                 at_date=from_date - 1, # this is not to_date\n
                                 simulation_state=params[\'simulation_state\'],\n
-                                # XXX this adds a need for account\n
-                                # ie. impossible to produce this report only\n
-                                # for a mirror section and any nodes\n
-                                node_uid=kw[\'node_uid\'],\n
-                                # XXX must be a list in current Z SQL Method\n
+                                node_uid=[kw[\'node_uid\']],\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

@@ -40,7 +40,23 @@
                             <item>
                                 <key> <string>node_uid</string> </key>
                                 <value>
-                                  <dictionary/>
+                                  <dictionary>
+                                    <item>
+                                        <key> <string>type</string> </key>
+                                        <value> <string>list</string> </value>
+                                    </item>
+                                  </dictionary>
+                                </value>
+                            </item>
+                            <item>
+                                <key> <string>portal_type</string> </key>
+                                <value>
+                                  <dictionary>
+                                    <item>
+                                        <key> <string>type</string> </key>
+                                        <value> <string>list</string> </value>
+                                    </item>
+                                  </dictionary>
                                 </value>
                             </item>
                             <item>
@@ -75,6 +91,7 @@
                             <string>node_uid</string>
                             <string>section_uid</string>
                             <string>simulation_state</string>
+                            <string>portal_type</string>
                             <string>at_date</string>
                           </list>
                         </value>
@@ -92,9 +109,10 @@
         </item>
         <item>
             <key> <string>arguments_src</string> </key>
-            <value> <string>node_uid\r\n
+            <value> <string>node_uid:list\r\n
 section_uid:list\r\n
 simulation_state:list\r\n
+portal_type:list\r\n
 at_date</string> </value>
         </item>
         <item>
@@ -156,12 +174,18 @@ Here, a group of movement means:\n
   FROM catalog, stock LEFT JOIN catalog AS mirror_section on \n
         ( stock.mirror_section_uid = mirror_section.uid )\n
 \n
-  WHERE stock.node_uid=<dtml-var node_uid> and\n
+  WHERE stock.node_uid in (<dtml-in node_uid><dtml-var sequence-item>\n
+         <dtml-unless sequence-end>, </dtml-unless></dtml-in>) and\n
        <dtml-if simulation_state>\n
         stock.simulation_state in (<dtml-in simulation_state>\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
@@ -182,12 +206,18 @@ Here, a group of movement means:\n
         catalog AS catalog, stock AS stock LEFT JOIN catalog AS mirror_section\n
         ON ( stock.mirror_section_uid = mirror_section.uid )\n
 \n
-  WHERE stock.node_uid=<dtml-var node_uid> and\n
+  WHERE stock.node_uid in (<dtml-in node_uid><dtml-var sequence-item>\n
+         <dtml-unless sequence-end>, </dtml-unless></dtml-in>) and\n
        <dtml-if simulation_state>\n
         stock.simulation_state in (<dtml-in simulation_state>\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
@@ -268,12 +298,18 @@ Here, a group of movement means:\n
   FROM catalog, stock LEFT JOIN catalog AS mirror_section on \n
         ( stock.mirror_section_uid = mirror_section.uid )\n
 \n
-  WHERE stock.node_uid=<dtml-var node_uid> and\n
+  WHERE stock.node_uid in (<dtml-in node_uid><dtml-var sequence-item>\n
+         <dtml-unless sequence-end>, </dtml-unless></dtml-in>) and\n
        <dtml-if simulation_state>\n
         stock.simulation_state in (<dtml-in simulation_state>\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
@@ -294,12 +330,18 @@ Here, a group of movement means:\n
         catalog AS catalog, stock AS stock LEFT JOIN catalog AS mirror_section\n
         ON ( stock.mirror_section_uid = mirror_section.uid )\n
 \n
-  WHERE stock.node_uid=<dtml-var node_uid> and\n
+  WHERE stock.node_uid in (<dtml-in node_uid><dtml-var sequence-item>\n
+         <dtml-unless sequence-end>, </dtml-unless></dtml-in>) and\n
        <dtml-if simulation_state>\n
         stock.simulation_state in (<dtml-in simulation_state>\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

bt5/erp5_accounting/bt/revision

-966
+967
\ No newline at end of file