diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_inventory_stock.catalog_keys.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_inventory_stock.catalog_keys.xml index 308aa2393d146f345ecc77df5ec45aa11cdf6150..ed85e62f359d950756220c1d1c18b6cce3883cdd 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_inventory_stock.catalog_keys.xml +++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_inventory_stock.catalog_keys.xml @@ -6,7 +6,7 @@ <value>1</value> </item> <item key="_filter_expression_archive" type="str"> - <value>python: context.isInventoryMovement()</value> + <value>python: context.isInventoryMovementType()</value> </item> <item key="_filter_expression_cache_key_archive" type="tuple"> <value>portal_type</value> 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 86be696ae5b7e6da73d03d0d07ddd3a7e57f0004..3314736b39a51df0ed1be707e7f1b748a4bdffe1 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 @@ -146,18 +146,6 @@ <dictionary/> </value> </item> - <item> - <key> <string>isInventoryMovement</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>isMovement</string> </key> - <value> - <dictionary/> - </value> - </item> <item> <key> <string>uid</string> </key> <value> @@ -178,7 +166,6 @@ <string>getDestinationUid</string> <string>getSourceSectionUid</string> <string>getDestinationSectionUid</string> - <string>isMovement</string> <string>getSourcePaymentUid</string> <string>getDestinationPaymentUid</string> <string>getSourceFunctionUid</string> @@ -194,7 +181,6 @@ <string>getPortalType</string> <string>getVariationText</string> <string>getSubVariationText</string> - <string>isInventoryMovement</string> </list> </value> </item> @@ -212,7 +198,6 @@ getSourceUid\r\n getDestinationUid\r\n getSourceSectionUid\r\n getDestinationSectionUid\r\n -isMovement\r\n getSourcePaymentUid\r\n getDestinationPaymentUid\r\n getSourceFunctionUid\r\n @@ -227,8 +212,7 @@ getStopDate\r\n isAccountable\r\n getPortalType\r\n getVariationText\r\n -getSubVariationText\r\n -isInventoryMovement</string> </value> +getSubVariationText</string> </value> </item> <item> <key> <string>connection_id</string> </key> @@ -248,13 +232,12 @@ WHERE\n <dtml-in uid>\n uid=<dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if>\n </dtml-in>\n -;\n \n -<dtml-var "\'\\0\'">\n +<dtml-var sql_delimiter>\n \n <dtml-let row_list="[]" uid_dict="{}">\n <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n - <dtml-if "isInventoryMovement[loop_item] and isMovement[loop_item] and isAccountable[loop_item] and getResourceUid[loop_item]">\n + <dtml-if "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 @@ -377,13 +360,12 @@ WHERE\n <dtml-in uid>\n uid=<dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if>\n </dtml-in>\n -;\n \n -<dtml-var "\'\\0\'">\n +<dtml-var sql_delimiter>\n \n <dtml-let row_list="[]" uid_dict="{}">\n <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n - <dtml-if "isInventoryMovement[loop_item] and isMovement[loop_item] and isAccountable[loop_item] and getResourceUid[loop_item]">\n + <dtml-if "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 diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.catalog_keys.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.catalog_keys.xml index 4b6a7c24c624659a74ac6225efd62e5329a344be..430099cb20840c5f5c80b215ac56bc734762ad04 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list.catalog_keys.xml +++ b/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.isInventoryMovement()</value> + <value>python: context.providesIMovement() and not context.isInventoryMovementType()</value> </item> <item key="_filter_expression_cache_key_archive" type="tuple"> <value>portal_type</value> diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision index 73181427a2868edd79f087fb2c0ac0fce92314b6..ae4ee13c08e7628701b925b8962108bd7643bf6e 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision +++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision @@ -1 +1 @@ -199 \ No newline at end of file +200 \ No newline at end of file