lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX Can read salary if permission + user under hierarchy

Browse Source
This commit is contained in:
Laurent Destailleur 2020-02-18 23:44:36 +01:00
commit dacf896f80
2 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/core/modules/modProjet.class.php
View File

@ -216,29 +216,6 @@ class modProjet extends DolibarrModules
$this->export_label[$r]='ProjectsAndTasksLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
$this->export_permission[$r]=array(array("projet","export"));
$this->export_dependencies_array[$r]=array('projecttask'=>'pt.rowid', 'task_time'=>'ptt.rowid');
/*
if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
{
print '<input type="checkbox" id="usage_opportunity" name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ' checked="checked"').'"> ';
$htmltext = $langs->trans("ProjectFollowOpportunity");
print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
print '<br>';
}
if (empty($conf->global->PROJECT_HIDE_TASKS))
{
print '<input type="checkbox" id="usage_task" name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ' checked="checked"').'"> ';
$htmltext = $langs->trans("ProjectFollowTasks");
print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
print '<br>';
}
if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
{
print '<input type="checkbox" id="usage_bill_time" name="usage_bill_time"'.(GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '').'"> ';
$htmltext = $langs->trans("ProjectBillTimeDescription");
print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
print '<br>';
}
*/
$this->export_TypeFields_array[$r]=array(
's.rowid'=>"List:societe:nom::thirdparty",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_country:label',

6
htdocs/user/bank.php
View File

@ -147,7 +147,7 @@ if ($action == 'update' && !$cancel)
* View
*/
$form = new Form($db);
$childids = $user->getAllChildIds(1);
llxHeader(null, $langs->trans("BankAccounts"));
@ -286,10 +286,10 @@ if ($action != 'edit' && $action != 'create') // If not bank account yet, $acco
$MAXLIST = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
/*
* Last salaries
* Latest salary payments
*/
if (!empty($conf->salaries->enabled) &&
(($object->fk_user == $user->id) || ($user->rights->salaries->read && $object->id == $user->id))
$user->rights->salaries->read && (in_array($object->id, $childids) || $object->id == $user->id)
)
{
$salary = new PaymentSalary($db);