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

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

Browse Source 
Conflicts:
	htdocs/holiday/define_holiday.php
	htdocs/main.inc.php
	htdocs/societe/class/societe.class.php
This commit is contained in:
Laurent Destailleur 2018-02-20 15:06:41 +01:00
commit f207e91643
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/core/tpl/contacts.tpl.php
View File

@ -201,18 +201,12 @@ if ($permission) {
if ($tab[$i]['source']=='internal') if ($tab[$i]['source']=='internal')
{ {
$userstatic->id=$tab[$i]['id']; $userstatic->fetch($tab[$i]['id']);
$userstatic->lastname=$tab[$i]['lastname'];
$userstatic->firstname=$tab[$i]['firstname'];
$userstatic->photo=$tab[$i]['photo'];
$userstatic->login=$tab[$i]['login'];
echo $userstatic->getNomUrl(-1); echo $userstatic->getNomUrl(-1);
} }
if ($tab[$i]['source']=='external') if ($tab[$i]['source']=='external')
{ {
$contactstatic->id=$tab[$i]['id']; $contactstatic->fetch($tab[$i]['id']);
$contactstatic->lastname=$tab[$i]['lastname'];
$contactstatic->firstname=$tab[$i]['firstname'];
echo $contactstatic->getNomUrl(1); echo $contactstatic->getNomUrl(1);
} }
?> ?>
@ -223,16 +217,10 @@ if ($permission) {
<?php <?php
if ($tab[$i]['source']=='internal') if ($tab[$i]['source']=='internal')
{ {
$userstatic->id=$tab[$i]['id'];
$userstatic->lastname=$tab[$i]['lastname'];
$userstatic->firstname=$tab[$i]['firstname'];
echo $userstatic->LibStatut($tab[$i]['statuscontact'],3); echo $userstatic->LibStatut($tab[$i]['statuscontact'],3);
} }
if ($tab[$i]['source']=='external') if ($tab[$i]['source']=='external')
{ {
$contactstatic->id=$tab[$i]['id'];
$contactstatic->lastname=$tab[$i]['lastname'];
$contactstatic->firstname=$tab[$i]['firstname'];
echo $contactstatic->LibStatut($tab[$i]['statuscontact'],3); echo $contactstatic->LibStatut($tab[$i]['statuscontact'],3);
} }
?> ?>

11
htdocs/holiday/define_holiday.php
View File

@ -118,7 +118,7 @@ if (empty($reshook))
$userValue = $_POST['nb_holiday_'.$val['rowid']]; $userValue = $_POST['nb_holiday_'.$val['rowid']];
$userValue = $userValue[$userID]; $userValue = $userValue[$userID];
if (!empty($userValue)) if (!empty($userValue) || (string) $userValue == '0')
{ {
$userValue = price2num($userValue,5); $userValue = price2num($userValue,5);
} else { } else {
@ -174,11 +174,14 @@ $userstatic=new User($db);
llxHeader('', $langs->trans('CPTitreMenu')); llxHeader('', $langs->trans('CPTitreMenu'));
$typeleaves=$holiday->getTypes(1,1);
print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'; print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">'; if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="action" value="update">';
print '<input type="hidden" name="sortfield" value="'.$sortfield.'">'; print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">'; print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<input type="hidden" name="page" value="'.$page.'">'; print '<input type="hidden" name="page" value="'.$page.'">';
@ -223,10 +226,8 @@ if (is_numeric($listUsers) && $listUsers < 0)
setEventMessages($holiday->error, $holiday->errors, 'errors'); setEventMessages($holiday->error, $holiday->errors, 'errors');
} }
$var=true;
$i = 0; $i = 0;
$typeleaves=$holiday->getTypes(1,1);
if (count($typeleaves) == 0) if (count($typeleaves) == 0)
{ {
@ -240,8 +241,6 @@ else
$canedit=0; $canedit=0;
if (! empty($user->rights->holiday->define_holiday)) $canedit=1; if (! empty($user->rights->holiday->define_holiday)) $canedit=1;
print '<input type="hidden" name="action" value="update" />';
$moreforfilter=''; $moreforfilter='';
print '<div class="div-table-responsive">'; print '<div class="div-table-responsive">';