Really fix z_catalog_inventory_stock_list

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

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_inventory_stock.catalog_keys.xml

@@ -2,13 +2,4 @@
  <item key="sql_uncatalog_object" type="int">
   <value>1</value>
  </item>
- <item key="_is_filtered_archive" type="int">
-  <value>1</value>
- </item>
- <item key="_filter_expression_archive" type="str">
-  <value>python: context.isInventoryMovementType()</value>
- </item>
- <item key="_filter_expression_cache_key_archive" type="tuple">
-  <value>portal_type</value>
- </item>
 </catalog_method>

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_stock_list.catalog_keys.xml

@@ -2,4 +2,13 @@
  <item key="sql_catalog_object_list" type="int">
   <value>1</value>
  </item>
+ <item key="_is_filtered_archive" type="int">
+  <value>1</value>
+ </item>
+ <item key="_filter_expression_archive" type="str">
+  <value>python: context.providesIMovement() and context.isInventoryMovement()</value>
+ </item>
+ <item key="_filter_expression_cache_key_archive" type="tuple">
+  <value>portal_type</value>
+ </item>
 </catalog_method>

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_stock_list.xml

@@ -146,6 +146,12 @@
                                   <dictionary/>
                                 </value>
                             </item>
+                            <item>
+                                <key> <string>isMovement</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
                             <item>
                                 <key> <string>uid</string> </key>
                                 <value>
@@ -166,6 +172,7 @@
                             <string>getDestinationUid</string>
                             <string>getSourceSectionUid</string>
                             <string>getDestinationSectionUid</string>
+                            <string>isMovement</string>
                             <string>getSourcePaymentUid</string>
                             <string>getDestinationPaymentUid</string>
                             <string>getSourceFunctionUid</string>
@@ -198,6 +205,7 @@ getSourceUid\r\n
 getDestinationUid\r\n
 getSourceSectionUid\r\n
 getDestinationSectionUid\r\n
+isMovement\r\n
 getSourcePaymentUid\r\n
 getDestinationPaymentUid\r\n
 getSourceFunctionUid\r\n
@@ -237,7 +245,7 @@ WHERE\n
 \n
 <dtml-let row_list="[]" uid_dict="{}">\n
   <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
-    <dtml-if "isAccountable[loop_item] and getResourceUid[loop_item]">\n
+    <dtml-if "isMovement[loop_item] and isAccountable[loop_item] and getResourceUid[loop_item]">\n
       <dtml-if "getDestinationUid[loop_item]">\n
         <dtml-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">\n
         <dtml-call expr="row_list.append([\n
@@ -365,7 +373,7 @@ WHERE\n
 \n
 <dtml-let row_list="[]" uid_dict="{}">\n
   <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
-    <dtml-if "isAccountable[loop_item] and getResourceUid[loop_item]">\n
+    <dtml-if "isMovement[loop_item] and isAccountable[loop_item] and getResourceUid[loop_item]">\n
       <dtml-if "getDestinationUid[loop_item]">\n
         <dtml-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">\n
         <dtml-call expr="row_list.append([\n

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.catalog_keys.xml

@@ -6,7 +6,7 @@
   <value>1</value>
  </item>
  <item key="_filter_expression_archive" type="str">
-  <value>python: context.providesIMovement() and not context.isInventoryMovementType()</value>
+  <value>python: context.providesIMovement() and not context.isInventoryMovement()</value>
  </item>
  <item key="_filter_expression_cache_key_archive" type="tuple">
   <value>portal_type</value>

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision

-200
+201
\ No newline at end of file