diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetFullInventoryDate.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetFullInventoryDate.xml index 416754e1720c2c973f69635d8c739d454b5138cf..0b7a78b7f41355a44df185b483b1b92c5be5b474 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetFullInventoryDate.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetFullInventoryDate.xml @@ -63,6 +63,17 @@ <dictionary/> </value> </item> + <item> + <key> <string>simulation_state</string> </key> + <value> + <dictionary> + <item> + <key> <string>default</string> </key> + <value> <string>\'delivered\'</string> </value> + </item> + </dictionary> + </value> + </item> </dictionary> </value> </item> @@ -74,6 +85,7 @@ <string>column_id_list</string> <string>group_by_expression</string> <string>date</string> +<string>simulation_state</string> </list> </value> </item> @@ -93,7 +105,8 @@ <value> <string>column_value_list_list:list\r\n column_id_list:list\r\n group_by_expression\r\n -date</string> </value> +date\r\n +simulation_state=\'delivered\'</string> </value> </item> <item> <key> <string>connection_id</string> </key> @@ -114,6 +127,9 @@ FROM\n inventory\n WHERE\n is_full_inventory = TRUE\n + <dtml-if simulation_state>\n + AND simulation_state = <dtml-sqlvar simulation_state type="string">\n + </dtml-if>\n <dtml-in prefix="loop" expr="_.range(_.len(column_id_list))">\n AND <dtml-var expr="column_id_list[loop_item]"> IN (\n <dtml-in expr="column_value_list_list[loop_item]">\n @@ -174,6 +190,9 @@ FROM\n inventory\n WHERE\n is_full_inventory = TRUE\n + <dtml-if simulation_state>\n + AND simulation_state = <dtml-sqlvar simulation_state type="string">\n + </dtml-if>\n <dtml-in prefix="loop" expr="_.range(_.len(column_id_list))">\n AND <dtml-var expr="column_id_list[loop_item]"> IN (\n <dtml-in expr="column_value_list_list[loop_item]">\n diff --git a/product/ERP5/bootstrap/erp5_core/bt/dependency_list b/product/ERP5/bootstrap/erp5_core/bt/dependency_list index 651f271cd8b0c1c11fd17eebd0da1c8324990dcd..09ebd39abae920514cb22934c8a08d0fb1cf8177 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/dependency_list +++ b/product/ERP5/bootstrap/erp5_core/bt/dependency_list @@ -1 +1 @@ -erp5_catalog \ No newline at end of file +erp5_catalog (>= 1.1) \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index d7b14a6c47450ae9b84d7ccecc7de768a95042d9..bf2c10d23eca5d734da4ac2137ace1d04817ab26 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -476 \ No newline at end of file +477