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

Merge branch '15.0' of https://github.com/Dolibarr/dolibarr into 15_fix_template_modbuilder

Browse Source
This commit is contained in:
Florian HENRY 2022-05-18 22:25:38 +02:00
commit a70274dc47
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/societe/list.php
View File

@ -1466,7 +1466,7 @@ while ($i < min($num, $limit)) {
} }
// Address // Address
if (!empty($arrayfields['s.address']['checked'])) { if (!empty($arrayfields['s.address']['checked'])) {
print '<td>'.dol_escape_htmltag($obj->address).'</td>'; print '<td class="tdoverflowmax250" title="'.dol_escape_htmltag($obj->address).'">'.dol_escape_htmltag($obj->address).'</td>';
if (!$i) { if (!$i) {
$totalarray['nbfield']++; $totalarray['nbfield']++;
} }
@ -1673,7 +1673,7 @@ while ($i < min($num, $limit)) {
print $hookmanager->resPrint; print $hookmanager->resPrint;
// Date creation // Date creation
if (!empty($arrayfields['s.datec']['checked'])) { if (!empty($arrayfields['s.datec']['checked'])) {
print '<td class="center nowrap">'; print '<td class="center nowraponall">';
print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser'); print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
print '</td>'; print '</td>';
if (!$i) { if (!$i) {
@ -1682,7 +1682,7 @@ while ($i < min($num, $limit)) {
} }
// Date modification // Date modification
if (!empty($arrayfields['s.tms']['checked'])) { if (!empty($arrayfields['s.tms']['checked'])) {
print '<td class="center nowrap">'; print '<td class="center nowraponall">';
print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser'); print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
print '</td>'; print '</td>';
if (!$i) { if (!$i) {
@ -1691,7 +1691,7 @@ while ($i < min($num, $limit)) {
} }
// Status // Status
if (!empty($arrayfields['s.status']['checked'])) { if (!empty($arrayfields['s.status']['checked'])) {
print '<td class="center nowrap">'.$companystatic->getLibStatut(5).'</td>'; print '<td class="center nowraponall">'.$companystatic->getLibStatut(5).'</td>';
if (!$i) { if (!$i) {
$totalarray['nbfield']++; $totalarray['nbfield']++;
} }

2
htdocs/theme/eldy/global.inc.php
View File

@ -3481,6 +3481,8 @@ div .tdtop {
vertical-align: top !important; vertical-align: top !important;
/*padding-top: 10px !important; /*padding-top: 10px !important;
padding-bottom: 2px !important; */ padding-bottom: 2px !important; */
padding-top: 6px !important;
padding-bottom: 4px !important;
} }
table.border td, table.bordernooddeven td, div.border div div.tagtd { table.border td, table.bordernooddeven td, div.border div div.tagtd {

2
htdocs/theme/md/style.css.php
View File

@ -4144,7 +4144,7 @@ div.tabBar .noborder {
} }
div .tdtop { div .tdtop {
vertical-align: top !important; vertical-align: top !important;
padding-top: 5px !important; padding-top: 8px !important;
padding-bottom: 0px !important; padding-bottom: 0px !important;
} }

2
htdocs/user/card.php
View File

@ -1707,7 +1707,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print "</td></tr>\n"; print "</td></tr>\n";
// VCard // VCard
print '<tr><td class="tdtop">'.$langs->trans("VCard").'</td>'; print '<tr><td>'.$langs->trans("VCard").'</td>';
print '<td>'; print '<td>';
print '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'">'; print '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'">';
print img_picto($langs->trans("Download"), 'vcard.png', 'class="paddingrightonly"'); print img_picto($langs->trans("Download"), 'vcard.png', 'class="paddingrightonly"');