Merge branch 'development' into test

api/v2/get/products.php

@@ -13,6 +13,8 @@ if (empty($partner->soldto) || $partner->soldto == ''){$soldto_search = '%';} el
 
 //default whereclause
 $whereclause = '';
+$whereclause_alt = '';
+$whereclause_alt2 = '';
 
 list($whereclause,$condition) = getWhereclause('products',$permission,$partner,'get');
 

api/v2/get/user_roles.php

@@ -52,7 +52,7 @@ if(isset($get_content) && $get_content!=''){
 
 //Filter system roles for users without delete permission on user_roles
 if (isAllowed('user_roles', $profile, $permission, 'D') !== 1) {
-    $clause .= ' AND r.is_system != 1';
+    $clause .= ' AND r.is_system != 1 AND r.role_hierarchy >= '.$permission;
 }
 
 //Build WHERE clause