diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index bd1fb2156c62fab6e0bdd22ef297d5ed82e464c3..a60ac19d0afa43bfc7c615e593045fd815d68708 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -384,7 +384,7 @@ print '</div>';
print '<input id="fillfromthirdparty" type="radio" '.((GETPOST("selectorforbarcode")=='fillfromthirdparty')?'checked ':'').'name="selectorforbarcode" value="fillfromthirdparty" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueFromThirdParty").' ';
print '<br>';
print '<div class="showforthirdpartyselector">';
-print $form->select_company(GETPOST('socid'), 'socid', '', 1, 0, 0, array(), 0, 'minwidth300');
+print $form->select_company(GETPOST('socid'), 'socid', '', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
print ' <input type="submit" id="submitthirdparty" name="submitthirdparty" class="button showforthirdpartyselector" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
print '</div>';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index d6fa064df394b28ba774547686eaeca68fab6fa0..08ca0e6b067bd60c51a75f13b1ee4ae980f1617f 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2587,12 +2587,8 @@ if ($action == 'create' && $user->rights->commande->creer)
if ($action != 'presend')
{
print '<div class="fichecenter"><div class="fichehalfleft">';
- // print '<table width="100%"><tr><td width="50%" valign="top">';
- // print '<a name="builddoc"></a>'; // ancre
- /*
- * Documents generes
- */
+ // Documents
$comref = dol_sanitizeFileName($object->ref);
$file = $conf->commande->dir_output . '/' . $comref . '/' . $comref . '.pdf';
$relativepath = $comref . '/' . $comref . '.pdf';
@@ -2611,14 +2607,12 @@ if ($action == 'create' && $user->rights->commande->creer)
print '</div><div class="fichehalfright"><div class="ficheaddleft">';
- // print '</td><td valign="top" width="50%">';
// List of actions on element
include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
$formactions = new FormActions($db);
$somethingshown = $formactions->showactions($object, 'order', $socid);
- // print '</td></tr></table>';
print '</div></div></div>';
}
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 66941d3ded7d8bae49792d8f9196bc560da00178..50679085f129b301d5e53fd88c8f1aa8ef5140df 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -885,7 +885,7 @@ else
{
print '<div class="tabBar">';
print $error;
- print '<br /><br /><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
+ print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
print '</div>';
}
else
@@ -994,10 +994,10 @@ else
print '<table class="border" width="100%">';
print '<tbody>';
- $linkback='';
+ $linkback='<a href="'.DOL_URL_ROOT.'/holiday/list.php">'.$langs->trans("BackToList").'</a>';
print '<tr>';
- print '<td width="25%">'.$langs->trans("Ref").'</td>';
+ print '<td class="titlefield">'.$langs->trans("Ref").'</td>';
print '<td>';
print $form->showrefnav($cp, 'id', $linkback, 1, 'rowid', 'ref');
print '</td>';
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index fb791d84ee603ea51d5efb76216c3e5d4df415a3..03ffcf2b465e3f03b644e97ea80e711722b2f5c1 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1219,7 +1219,7 @@ class Holiday extends CommonObject
// List for Dolibarr users
if ($type)
{
- $sql = "SELECT u.rowid, u.lastname, u.firstname";
+ $sql = "SELECT u.rowid, u.lastname, u.firstname, u.gender, u.photo, u.employee, u.statut";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
@@ -1250,11 +1250,15 @@ class Holiday extends CommonObject
$obj = $this->db->fetch_object($resql);
$tab_result[$i]['rowid'] = $obj->rowid;
- $tab_result[$i]['name'] = $obj->lastname;
+ $tab_result[$i]['name'] = $obj->lastname; // deprecated
$tab_result[$i]['lastname'] = $obj->lastname;
$tab_result[$i]['firstname'] = $obj->firstname;
- $tab_result[$i]['type'] = $obj->type;
- $tab_result[$i]['nb_holiday'] = $obj->nb_holiday;
+ $tab_result[$i]['gender'] = $obj->gender;
+ $tab_result[$i]['status'] = $obj->statut;
+ $tab_result[$i]['employee'] = $obj->employee;
+ $tab_result[$i]['photo'] = $obj->photo;
+ //$tab_result[$i]['type'] = $obj->type;
+ //$tab_result[$i]['nb_holiday'] = $obj->nb_holiday;
$i++;
}
@@ -1264,7 +1268,7 @@ class Holiday extends CommonObject
else
{
// Erreur SQL
- $this->error="Error ".$this->db->lasterror();
+ $this->errors[]="Error ".$this->db->lasterror();
return -1;
}
}
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 52876b1d1cddb43046c7ffc68aecd2b541686a4c..6af57716648053d4f5a706b3ab07e5fda9a15ef3 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -181,6 +181,10 @@ if ($result < 0)
}
$listUsers = $holiday->fetchUsers(false,true);
+if (is_numeric($listUsers) && $listUsers < 0)
+{
+ setEventMessages($holiday->error, $holiday->errors, 'errors');
+}
$var=true;
$i = 0;
@@ -260,9 +264,13 @@ else
print '<tr '.$bc[$var].' style="height: 20px;">';
print '<td>';
$userstatic->id=$users['rowid'];
- $userstatic->lastname=$users['name'];
+ $userstatic->lastname=$users['lastname'];
$userstatic->firstname=$users['firstname'];
- print $userstatic->getNomUrl(1);
+ $userstatic->gender=$users['gender'];
+ $userstatic->photo=$users['photo'];
+ $userstatic->statut=$users['status'];
+ $userstatic->employee=$users['employee'];
+ print $userstatic->getNomUrl(-1);
print '</td>';
if (count($typeleaves))
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index ab588812c32c6ad076ef401d2969f43d5ea854e3..e2554cffffbb4b43bd3f27d7f55fe6921c6f8284 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -108,12 +108,12 @@ if ($object->id)
}
- print '<table class="border" width="100%">';
+ print '<table class="border centpercent">';
- $linkback='';
+ $linkback='<a href="'.DOL_URL_ROOT.'/holiday/list.php">'.$langs->trans("BackToList").'</a>';
print '<tr>';
- print '<td width="25%">'.$langs->trans("Ref").'</td>';
+ print '<td class="titlefield">'.$langs->trans("Ref").'</td>';
print '<td>';
print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref');
print '</td>';
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index f6937cff2396f018b433bc77fee5fbe9e04a98b3..5ef9b0e1ce42d216d47a42be06ddd6ecc935b868 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -991,7 +991,6 @@ else
}
print "</div>";
- print "<br>\n";
if ($action != 'presend')
{
@@ -1011,7 +1010,7 @@ else
$somethingshown=$formfile->show_documents('project',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf);
- print '</div></div class="fichehalfright">';
+ print '</div><div class="fichehalfright"><div class="ficheaddleft">';
if (!empty($object->id))
{
@@ -1021,7 +1020,7 @@ else
$somethingshown=$formactions->showactions($object,'project',$socid);
}
- print '</div>';
+ print '</div></div></div>';
}
// Hook to add more things on page
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index cf8d5c3665f353fb3d4e729ed3947a075b8a1009..fe6fe73811098de1abc20025ce2039a9711b790a 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -378,10 +378,11 @@ $showdatefilter=0;
// Show the filter on date on top of element list
if (! $showdatefilter)
{
- print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$projectid.'" method="post">';
+ print '<div class="center centpercent">';
+ print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$projectid.'" method="post">';
print '<input type="hidden" name="tablename" value="'.$tablename.'">';
print '<input type="hidden" name="action" value="view">';
- print '<table><tr>';
+ print '<table class="center"><tr>';
print '<td>'.$langs->trans("From").' ';
print $form->select_date($dates,'dates',0,0,1,'',1,0,1);
print '</td>';
@@ -393,7 +394,8 @@ if (! $showdatefilter)
print '</td>';
print '</tr></table>';
print '</form>';
-
+ print '</div>';
+
$showdatefilter++;
}
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index ca27d42c995235c8a494ec22452f08de5104f756..59238e786f1af99e4c1d0cc995a12ca32be03e65 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2205,7 +2205,7 @@ table.liste, table.noborder, table.formdoc, div.noborder {
-webkit-border-radius: 0.2em;
border-radius: 0.2em;*/
}
-#tablelines tr.liste_titre td, form.formnoborder div, tr.liste_titre.trnoborder td {
+#tablelines tr.liste_titre:first-child td, form.formnoborder div, tr.liste_titre.trnoborder td {
border-top-width: 1px;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
border-top-style: solid;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 5cb3995c6ba1002a50eafec18198c41142474fe9..c45055a96f5476f410c78de1d5e439cf68630829 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2075,7 +2075,7 @@ table.liste, table.noborder, table.formdoc, div.noborder {
-webkit-border-radius: 0.1em;
border-radius: 0.1em;
}
-#tablelines tr.liste_titre td, form.formnoborder, tr.liste_titre.trnoborder td {
+#tablelines tr.liste_titre:first-child td, form.formnoborder, tr.liste_titre.trnoborder td {
border-top-width: 1px;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
border-top-style: solid;