From e08dda9bee55c92bafe0319907d885c0af6b3361 Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Wed, 1 Jun 2022 15:16:32 +0200 Subject: [PATCH] Order filter "admin workorder" includes assigned terminations even is building is not finished --- application/Order/OrderModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/Order/OrderModel.php b/application/Order/OrderModel.php index 85243de77..b6a9e5845 100644 --- a/application/Order/OrderModel.php +++ b/application/Order/OrderModel.php @@ -389,7 +389,7 @@ class OrderModel { $status_parts[] = "(Building.network_id = $net_id AND Terminationstatus.code >= ".TT_TERMSTATUS_CONNECTED.")"; } if($filter['network_linked_status'][$net_id] == "building_connected") { - $status_parts[] = "(Building.network_id = $net_id AND Buildingstatus.code >= ".TT_BUILDINGSTATUS_CONNECTED.")"; + $status_parts[] = "(Building.network_id = $net_id AND (Buildingstatus.code >= ".TT_BUILDINGSTATUS_CONNECTED." OR Terminationstatus.code >= ".TT_TERMSTATUS_ASSIGNED."))"; } if($filter['network_linked_status'][$net_id] == "pipework_needed") { $status_parts[] = "(Building.network_id = $net_id AND Buildingstatus.code <= ".TT_BUILDINGSTATUS_CONNECTED.")";