From 44ea0c4c81c6f7a0e7b82b286efc37db89607621 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Thu, 6 Sep 2007 14:49:43 +0000 Subject: [PATCH] Use isInventoryMovement instead of isInventoryLine: - it was missnamed - cells defined on lines must be indexed in place of the lines if any exist (already handled via isAccountable). git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16124 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../z_catalog_inventory_stock_list.xml | 10 +++++----- .../bootstrap/erp5_mysql_innodb_catalog/bt/revision | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_stock_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_stock_list.xml index 19eb018a90..f9fa3a32b9 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_stock_list.xml +++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_inventory_stock_list.xml @@ -156,7 +156,7 @@ </value> </item> <item> - <key> <string>isInventoryLine</string> </key> + <key> <string>isInventoryMovement</string> </key> <value> <dictionary/> </value> @@ -203,7 +203,7 @@ <string>getPortalType</string> <string>getVariationText</string> <string>getSubVariationText</string> -<string>isInventoryLine</string> +<string>isInventoryMovement</string> </list> </value> </item> @@ -243,7 +243,7 @@ isAccountable\r\n getPortalType\r\n getVariationText\r\n getSubVariationText\r\n -isInventoryLine</string> </value> +isInventoryMovement</string> </value> </item> <item> <key> <string>connection_id</string> </key> @@ -269,7 +269,7 @@ WHERE\n \n <dtml-let row_list="[]">\n <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n - <dtml-if expr="isInventoryLine[loop_item] and isMovement[loop_item] and isAccountable[loop_item] and getResourceUid[loop_item]">\n + <dtml-if expr="isInventoryMovement[loop_item] and isMovement[loop_item] and isAccountable[loop_item] and getResourceUid[loop_item]">\n <dtml-if "getDestinationUid[loop_item]">\n <dtml-call expr="row_list.append([\n uid[loop_item], \n @@ -393,7 +393,7 @@ WHERE\n \n <dtml-let row_list="[]">\n <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n - <dtml-if expr="isInventoryLine[loop_item] and isMovement[loop_item] and isAccountable[loop_item] and getResourceUid[loop_item]">\n + <dtml-if expr="isInventoryMovement[loop_item] and isMovement[loop_item] and isAccountable[loop_item] and getResourceUid[loop_item]">\n <dtml-if "getDestinationUid[loop_item]">\n <dtml-call expr="row_list.append([\n uid[loop_item], \n diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision index efee1f88bb..d15a2cc44e 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision +++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision @@ -1 +1 @@ -78 \ No newline at end of file +80 -- 2.30.9