Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX #7806

Browse Source
This commit is contained in:
Laurent Destailleur
2017-11-25 01:24:24 +01:00
parent 38c770ffb3
commit 4cbcf5189a
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/user/class/api_users.class.php
View File

@@ -286,6 +286,7 @@ class Users extends DolibarrApi
* @return array Array of cleaned object properties
*/
function _cleanObjectDatas($object) {
global $conf;
$object = parent::_cleanObjectDatas($object);
@@ -298,10 +299,16 @@ class Users extends DolibarrApi
unset($object->total_localtax1);
unset($object->total_localtax2);
unset($object->total_ttc);
unset($object->libelle_incoterms);
unset($object->location_incoterms);
unset($object->fk_delivery_address);
unset($object->fk_incoterms);
unset($object->all_permissions_are_loaded);
unset($object->shipping_method_id);
unset($object->nb_rights);
unset($object->search_sid);
unset($object->ldap_sid);
// List of properties never returned by API, whatever are permissions
unset($object->pass);
@@ -310,6 +317,19 @@ class Users extends DolibarrApi
unset($object->pass_temp);
unset($object->api_key);
unset($object->clicktodial_password);
unset($object->openid);
$canreadsalary = ((! empty($conf->salaries->enabled) && ! empty(DolibarrApiAccess::$user->rights->salaries->read))
|| (! empty($conf->hrm->enabled) && ! empty(DolibarrApiAccess::$user->rights->hrm->employee->read)));
if (! $canreadsalary)
{
unset($object->salary);
unset($object->salaryextra);
unset($object->thm);
unset($object->tjm);
}
return $object;
}