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 73700c545ffd21300b119422f9efb2d37917e046..99dcb50bd211c2dae8e7d7ceee4b95cc2ab426f7 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 @@ -74,6 +74,12 @@ </dictionary> </value> </item> + <item> + <key> <string>where_expression</string> </key> + <value> + <dictionary/> + </value> + </item> </dictionary> </value> </item> @@ -81,11 +87,12 @@ <key> <string>_keys</string> </key> <value> <list> -<string>column_value_list_list</string> -<string>column_id_list</string> -<string>group_by_expression</string> -<string>date</string> -<string>simulation_state</string> + <string>column_value_list_list</string> + <string>column_id_list</string> + <string>group_by_expression</string> + <string>date</string> + <string>simulation_state</string> + <string>where_expression</string> </list> </value> </item> @@ -106,7 +113,8 @@ column_id_list:list\r\n group_by_expression\r\n date\r\n -simulation_state=delivered</string> </value> +simulation_state=delivered\r\n +where_expression</string> </value> </item> <item> <key> <string>connection_id</string> </key> @@ -141,6 +149,9 @@ WHERE\n <dtml-if date>\n AND date <= <dtml-sqlvar date type="string">\n </dtml-if>\n + <dtml-if where_expression>\n + AND <dtml-var where_expression>\n + </dtml-if>\n GROUP BY\n <dtml-var group_by_expression>\n @@ -204,6 +215,9 @@ WHERE\n <dtml-if date>\n AND date <= <dtml-sqlvar date type="string">\n </dtml-if>\n + <dtml-if where_expression>\n + AND <dtml-var where_expression>\n + </dtml-if>\n GROUP BY\n <dtml-var group_by_expression>\n diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index 25802a20038d64f3d8a67c217ce49cac10c4fc33..995fb338a8d0db69b3a4be8d7c3c1c0a2d52dbfc 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -592 \ No newline at end of file +593 \ No newline at end of file