diff --git a/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Person_zGetAvailableTime.xml b/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Node_zGetAvailableTime.xml similarity index 98% rename from bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Person_zGetAvailableTime.xml rename to bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Node_zGetAvailableTime.xml index 4d6794ab906073cae69a49e8af42ebf921a2ab6f..17e70fb376d6bb78d519bfa4c130d7da7b7701d8 100644 --- a/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Person_zGetAvailableTime.xml +++ b/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Node_zGetAvailableTime.xml @@ -51,7 +51,7 @@ simulation_state:list</string> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>Person_zGetAvailableTime</string> </value> + <value> <string>Node_zGetAvailableTime</string> </value> </item> <item> <key> <string>max_cache_</string> </key> @@ -83,7 +83,6 @@ SET @result := 0,\n @current_stop_date := <dtml-sqlvar expr="from_date" type="datetime">,\n @countable := -1,\n @total_quantity := 0;\n - <dtml-var sql_delimiter>\n \n SELECT \n diff --git a/bt5/erp5_calendar/bt/revision b/bt5/erp5_calendar/bt/revision index c4c828bd4ee315c1205df1586629eb43f5d672bd..304feabdcedcee70e4d929e2dbee0a6205be7af6 100644 --- a/bt5/erp5_calendar/bt/revision +++ b/bt5/erp5_calendar/bt/revision @@ -1 +1 @@ -386 \ No newline at end of file +387 \ No newline at end of file diff --git a/product/ERP5/Tool/SimulationTool.py b/product/ERP5/Tool/SimulationTool.py index b21089806cfccd05d7a2775afdbd912af04fd03a..8c95e1f441e1748d5cb53d84a3cbbd392471873d 100644 --- a/product/ERP5/Tool/SimulationTool.py +++ b/product/ERP5/Tool/SimulationTool.py @@ -2924,7 +2924,7 @@ class SimulationTool(BaseTool): portal.getPortalTransitInventoryStateList() + \ portal.getPortalReservedInventoryStateList() - sql_result = portal.Person_zGetAvailableTime( + sql_result = portal.Node_zGetAvailableTime( from_date=from_date, to_date=to_date, portal_type=portal_type,