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

Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2023-01-04 18:13:25 +01:00
commit 3aa42d09e3
4 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
htdocs/admin/modulehelp.php
View File

@ -372,13 +372,13 @@ if ($mode == 'feature') {
if (count($objMod->depends)) {
$text .= join(',', $objMod->depends);
} else {
$text .= $langs->trans("None");
$text .= '<span class="opacitymedium">'.$langs->trans("None").'</span>';
}
$text .= '<br><strong>'.$langs->trans("RequiredBy").':</strong> ';
if (count($objMod->requiredby)) {
$text .= join(',', $objMod->requiredby);
} else {
$text .= $langs->trans("None");
$text .= '<span class="opacitymedium">'.$langs->trans("None").'</span>';
}
$text .= '<br><br>';
@ -395,7 +395,7 @@ if ($mode == 'feature') {
$i++;
}
} else {
$text .= $langs->trans("No");
$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
}
$text .= '<br>';
@ -408,7 +408,7 @@ if ($mode == 'feature') {
$i++;
}
} else {
$text .= $langs->trans("No");
$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
}
$text .= '<br>';
@ -418,7 +418,7 @@ if ($mode == 'feature') {
if (dol_is_file($filedata)) {
$text .= $langs->trans("Yes").' <span class="opacitymedium">('.$moduledir.'/sql/data.sql)</span>';
} else {
$text .= $langs->trans("No");
$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
}
$text .= '<br>';
@ -437,7 +437,7 @@ if ($mode == 'feature') {
}
}
} else {
$text .= $langs->trans("No");
$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
}
$text .= '<br>';
@ -446,7 +446,7 @@ if ($mode == 'feature') {
if (isset($objMod->module_parts) && isset($objMod->module_parts['models']) && $objMod->module_parts['models']) {
$text .= $langs->trans("Yes");
} else {
$text .= $langs->trans("No");
$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
}
$text .= '<br>';
@ -455,7 +455,7 @@ if ($mode == 'feature') {
if (isset($objMod->module_parts) && isset($objMod->module_parts['substitutions']) && $objMod->module_parts['substitutions']) {
$text .= $langs->trans("Yes");
} else {
$text .= $langs->trans("No");
$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
}
$text .= '<br>';
@ -468,7 +468,7 @@ if ($mode == 'feature') {
$i++;
}
} else {
$text .= $langs->trans("No");
$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
}
$text .= '<br>';
@ -502,7 +502,7 @@ if ($mode == 'feature') {
$i++;
}
} else {
$text .= $langs->trans("No");
$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
}
$text .= '<br>';
@ -531,7 +531,7 @@ if ($mode == 'feature') {
$i++;
}
} else {
$text .= $langs->trans("No");
$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
}
$text .= '<br>';
@ -544,7 +544,7 @@ if ($mode == 'feature') {
$i++;
}
} else {
$text .= $langs->trans("No");
$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
}
$text .= '<br>';
@ -553,7 +553,7 @@ if ($mode == 'feature') {
if (isset($objMod->menu) && !empty($objMod->menu)) { // objMod can be an array or just an int 1
$text .= $langs->trans("Yes");
} else {
$text .= $langs->trans("No");
$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
}
$text .= '<br>';
@ -566,7 +566,7 @@ if ($mode == 'feature') {
$i++;
}
} else {
$text .= $langs->trans("No");
$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
}
$text .= '<br>';
@ -579,13 +579,13 @@ if ($mode == 'feature') {
$i++;
}
} else {
$text .= $langs->trans("No");
$text .= '<span class="opacitymedium">'.$langs->trans("No").'</span>';
}
$text .= '<br>';
$text .= '<br><strong>'.$langs->trans("AddOtherPagesOrServices").':</strong> ';
$text .= $langs->trans("DetectionNotPossible");
$text .= '<span class="opacitymedium">'.$langs->trans("DetectionNotPossible").'</span>';
}
@ -594,7 +594,7 @@ if ($mode == 'changelog') {
if ($changelog) {
$text .= '<div class="moduledesclong">'.$changelog.'<div>';
} else {
$text .= '<div class="moduledesclong">'.$langs->trans("NotAvailable").'</div>';
$text .= '<div class="moduledesclong"><span class="opacitymedium">'.$langs->trans("NotAvailable").'</span></div>';
}
}

11
htdocs/hrm/admin/admin_establishment.php
View File

@ -145,13 +145,12 @@ if ($result) {
$establishmentstatic->label = $obj->label;
$establishmentstatic->status = $obj->status;
print '<tr class="oddeven">';
print '<td>'.$establishmentstatic->getNomUrl(1).'</td>';
print '<td>'.$obj->label.'</td>';
print '<td class="left">'.$obj->address.'</td>';
print '<td class="left">'.$obj->zip.'</td>';
print '<td class="left">'.$obj->town.'</td>';
print '<td>'.dol_escape_htmltag($obj->label).'</td>';
print '<td>'.dol_escape_htmltag($obj->address).'</td>';
print '<td>'.dol_escape_htmltag($obj->zip).'</td>';
print '<td>'.dol_escape_htmltag($obj->town).'</td>';
print '<td class="right">';
print $establishmentstatic->getLibStatut(5);
print '</td>';
@ -160,7 +159,7 @@ if ($result) {
$i++;
}
} else {
print '<tr class="oddeven"><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
print '<tr class="oddeven"><td colspan="7"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
}
print '</table>';

2
htdocs/langs/en_US/hrm.lang
View File

@ -86,7 +86,7 @@ SaveAddSkill = Skill(s) added
SaveLevelSkill = Skill(s) level saved
DeleteSkill = Skill removed
SkillsExtraFields=Attributs supplémentaires (Compétences)
JobsExtraFields=Attributs supplémentaires (Emplois)
JobsExtraFields=Attributs supplémentaires (Job profile)
EvaluationsExtraFields=Attributs supplémentaires (Evaluations)
NeedBusinessTravels=Need business travels
NoDescription=No description

2
htdocs/ticket/class/ticket.class.php
View File

@ -2565,7 +2565,7 @@ class Ticket extends CommonObject
if ($info_sendto['email'] != '') {
if (!empty($info_sendto['email'])) {
$sendto[] = trim($info_sendto['firstname']." ".$info_sendto['lastname'])." <".$info_sendto['email'].">";
$sendto[] = dolGetFirstLastname($info_sendto['firstname'], $info_sendto['lastname'])." <".$info_sendto['email'].">";
}
// Contact type