Merge branch 'gary' of http://10.10.1.6:3080/masada-admin/httpdocs into gary

wms/wipwhole-index-function.php

@@ -1040,6 +1040,10 @@ function getSaveEstimateInstallData($user_department_id, $role_id)
         return true;
     if ($user_department_id == '545' && $role_id == '6')
         return true;
+    if ($user_department_id == '312' && $role_id == '3')
+        return true;
+    if ($user_department_id == '541' && $role_id == '1')
+        return true;
     return false;
 }
 
@@ -1049,7 +1053,7 @@ function saveInstallData($user_department_id, $role_id)
         return true;
     if ($user_department_id == '521' && $role_id == '9')
         return true;
-    if ($user_department_id == '542' && in_array($role_id, ['1', '5', '6']))
+    if ($user_department_id == '541' && $role_id == '1')
         return true;
     if ($user_department_id == '543' && $role_id == '2')
         return true;

wms/wipwhole-renovate-index-function.php

@@ -1002,7 +1002,7 @@ function getWipwholeChangeButtonStatus($user_department_id)
 
 function getSaveEstimateInstallData($user_department_id, $role_id)
 {
-    if (in_array($user_department_id, ['50', '501']) && $role_id == '2')
+    if ($user_department_id == '541' && $role_id == '1')
         return true;
     if ($user_department_id == '311' && $role_id == '4')
         return true;