Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 17:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ldestailleur
2025-08-11 12:29:20 +02:00
parent c083499a35 4dac3ac7d1
commit d5db70b887
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/product/reassort.php
View File

@@ -558,6 +558,7 @@ if ($resql) {
if (isModEnabled("service") && $type == 1) { if (isModEnabled("service") && $type == 1) {
print '<td class="center">'; print '<td class="center">';
$regs = array();
if (preg_match('/([0-9]+)y/i', $objp->duration, $regs)) { if (preg_match('/([0-9]+)y/i', $objp->duration, $regs)) {
print $regs[1].' '.$langs->trans("DurationYear"); print $regs[1].' '.$langs->trans("DurationYear");
} elseif (preg_match('/([0-9]+)m/i', $objp->duration, $regs)) { } elseif (preg_match('/([0-9]+)m/i', $objp->duration, $regs)) {
@@ -638,6 +639,9 @@ if ($resql) {
print "</tr>\n"; print "</tr>\n";
$i++; $i++;
} }
if ($num == 0) {
print '<tr><td colspan="">'.$langs->trans("None").'</td></tr>';
}
print "</table>"; print "</table>";
print '</div>'; print '</div>';

6
htdocs/user/group/list.php
View File

@@ -466,7 +466,7 @@ while ($i < $imaxinloop) {
} }
} }
print '<td class="tdoverflowmax125">'; print '<td class="tdoverflowmax200">';
print $object->getNomUrl(1); print $object->getNomUrl(1);
if (isModEnabled('multicompany') && !$obj->entity) { if (isModEnabled('multicompany') && !$obj->entity) {
print img_picto($langs->trans("GlobalGroup"), 'redstar'); print img_picto($langs->trans("GlobalGroup"), 'redstar');
@@ -493,11 +493,11 @@ while ($i < $imaxinloop) {
if (!$i) { if (!$i) {
$totalarray['nbfield']++; $totalarray['nbfield']++;
} }
print '<td class="center nowrap">'.dol_print_date($db->jdate($obj->datec), "dayhour").'</td>'; print '<td class="center nowraponall">'.dol_print_date($db->jdate($obj->datec), "dayhour").'</td>';
if (!$i) { if (!$i) {
$totalarray['nbfield']++; $totalarray['nbfield']++;
} }
print '<td class="center nowrap">'.dol_print_date($db->jdate($obj->tms), "dayhour").'</td>'; print '<td class="center nowraponall">'.dol_print_date($db->jdate($obj->tms), "dayhour").'</td>';
if (!$i) { if (!$i) {
$totalarray['nbfield']++; $totalarray['nbfield']++;
} }