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

Fix: default value of new expense report is not correctly set

Browse Source
This commit is contained in:
Laurent Destailleur 2015-07-15 15:04:44 +02:00
parent 4d6ce2a1de
commit f48128baf7
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/expensereport/card.php
View File

@ -1115,7 +1115,10 @@ if ($action == 'create')
print '<td>'; print '<td>';
$object = new ExpenseReport($db); $object = new ExpenseReport($db);
$include_users = $object->fetch_users_approver_expensereport(); $include_users = $object->fetch_users_approver_expensereport();
$s=$form->select_dolusers((GETPOST('fk_user_validator')?GETPOST('fk_user_validator'):$conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR), "fk_user_validator", 1, "", 0, $include_users); $defaultselectuser=$user->fk_user; // Will work only if supervisor has permission to approve so is inside include_users
if (! empty($conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR)) $defaultselectuser=$conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR;
if (GETPOST('fk_user_validator') > 0) $defaultselectuser=GETPOST('fk_user_validator');
$s=$form->select_dolusers($defaultselectuser, "fk_user_validator", 1, "", 0, $include_users);
print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate")); print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';

2
htdocs/expensereport/index.php
View File

@ -120,7 +120,7 @@ if ($conf->use_javascript_ajax)
{ {
print '<tr '.$bc[0].'><td align="center" colspan="4">'; print '<tr '.$bc[0].'><td align="center" colspan="4">';
$data=array('series'=>$dataseries); $data=array('series'=>$dataseries);
dol_print_graph('stats',320,180,$data,1,'pie',0); dol_print_graph('stats',320,180,$data,1,'pie',0,'',0);
print '</td></tr>'; print '</td></tr>';
} }