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-02-27 16:10:10 +01:00
commit f0986a0fc0
6 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/prelevement/factures.php
View File

@ -105,7 +105,7 @@ if ($id > 0 || $ref) {
print '<tr><td class="titlefieldcreate">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>'; print '<tr><td class="titlefieldcreate">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>';
print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount).'</span></td></tr>'; print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount).'</span></td></tr>';
if ($object->date_trans <> 0) { if (!empty($object->date_trans)) {
$muser = new User($db); $muser = new User($db);
$muser->fetch($object->user_trans); $muser->fetch($object->user_trans);
@ -116,7 +116,7 @@ if ($id > 0 || $ref) {
print $object->methodes_trans[$object->method_trans]; print $object->methodes_trans[$object->method_trans];
print '</td></tr>'; print '</td></tr>';
} }
if ($object->date_credit <> 0) { if (!empty($object->date_credit)) {
print '<tr><td>'.$langs->trans('CreditDate').'</td><td>'; print '<tr><td>'.$langs->trans('CreditDate').'</td><td>';
print dol_print_date($object->date_credit, 'day'); print dol_print_date($object->date_credit, 'day');
print '</td></tr>'; print '</td></tr>';

6
htdocs/compta/prelevement/fiche-rejet.php
View File

@ -100,7 +100,7 @@ if ($id > 0 || $ref) {
print '<tr><td class="titlefieldcreate">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>'; print '<tr><td class="titlefieldcreate">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>';
print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount).'</span></td></tr>'; print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount).'</span></td></tr>';
if ($object->date_trans <> 0) { if (!empty($object->date_trans)) {
$muser = new User($db); $muser = new User($db);
$muser->fetch($object->user_trans); $muser->fetch($object->user_trans);
@ -111,7 +111,7 @@ if ($id > 0 || $ref) {
print $object->methodes_trans[$object->method_trans]; print $object->methodes_trans[$object->method_trans];
print '</td></tr>'; print '</td></tr>';
} }
if ($object->date_credit <> 0) { if (!empty($object->date_credit)) {
print '<tr><td>'.$langs->trans('CreditDate').'</td><td>'; print '<tr><td>'.$langs->trans('CreditDate').'</td><td>';
print dol_print_date($object->date_credit, 'day'); print dol_print_date($object->date_credit, 'day');
print '</td></tr>'; print '</td></tr>';
@ -249,7 +249,7 @@ if ($resql) {
$i++; $i++;
} }
} else { } else {
print '<tr><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>'; print '<tr><td colspan="6"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
} }
if ($num > 0) { if ($num > 0) {

4
htdocs/compta/prelevement/fiche-stat.php
View File

@ -94,7 +94,7 @@ if ($id > 0 || $ref) {
print '<tr><td class="titlefieldcreate">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>'; print '<tr><td class="titlefieldcreate">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>';
print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount).'</span></td></tr>'; print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount).'</span></td></tr>';
if ($object->date_trans <> 0) { if (!empty($object->date_trans)) {
$muser = new User($db); $muser = new User($db);
$muser->fetch($object->user_trans); $muser->fetch($object->user_trans);
@ -105,7 +105,7 @@ if ($id > 0 || $ref) {
print $object->methodes_trans[$object->method_trans]; print $object->methodes_trans[$object->method_trans];
print '</td></tr>'; print '</td></tr>';
} }
if ($object->date_credit <> 0) { if (!empty($object->date_credit)) {
print '<tr><td>'.$langs->trans('CreditDate').'</td><td>'; print '<tr><td>'.$langs->trans('CreditDate').'</td><td>';
print dol_print_date($object->date_credit, 'day'); print dol_print_date($object->date_credit, 'day');
print '</td></tr>'; print '</td></tr>';

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

@ -1575,8 +1575,7 @@ table[summary="list_of_modules"] .fa-cog {
height: 100px; height: 100px;
} }
.ls -alrt maxscreenheightless200 {
vi {
max-height: <?php echo isset($_SESSION['dol_screenheight']) ? max(500, (int) $_SESSION['dol_screenheight'] - 200) : 700; ?>px; /* we guarantee height of 500 */ max-height: <?php echo isset($_SESSION['dol_screenheight']) ? max(500, (int) $_SESSION['dol_screenheight'] - 200) : 700; ?>px; /* we guarantee height of 500 */
} }
.maxscreenheightless300 { .maxscreenheightless300 {
@ -5297,6 +5296,7 @@ span[phptag] {
.websitebar .button.bordertransp { .websitebar .button.bordertransp {
color: unset; color: unset;
text-decoration: unset !important; text-decoration: unset !important;
margin: 0px 4px 0px 4px !important
} }
.websitebar { .websitebar {
@ -5344,7 +5344,7 @@ span[phptag] {
.websiteinputurl { .websiteinputurl {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
line-height: 28px; line-height: 26px;
} }
.websiteiframenoborder { .websiteiframenoborder {
border: 0px; border: 0px;

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

@ -5296,6 +5296,12 @@ span[phptag] {
font-weight: normal; font-weight: normal;
color: #444 !important; color: #444 !important;
} }
.websitebar .button.bordertransp {
color: unset;
text-decoration: unset !important;
/* margin: 0px 4px 0px 4px !important */
}
.websitebar { .websitebar {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
background: #eee; background: #eee;
@ -5335,7 +5341,7 @@ span[phptag] {
.websiteinputurl { .websiteinputurl {
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
line-height: 28px; line-height: 26px;
} }
.websiteiframenoborder { .websiteiframenoborder {
border: 0px; border: 0px;
@ -5356,7 +5362,7 @@ span.websitebuttonsitepreviewdisabled img, a.websitebuttonsitepreviewdisabled im
.websitehelp { .websitehelp {
vertical-align: middle; vertical-align: middle;
float: right; float: right;
padding-top: 8px; padding-top: 5px;
} }
.websiteselectionsection { .websiteselectionsection {
border-left: 1px solid #bbb; border-left: 1px solid #bbb;

4
htdocs/website/index.php
View File

@ -2951,7 +2951,7 @@ if (!GETPOST('hide_websitemenu')) {
$url = $_SERVER["PHP_SELF"].'?action=deletesite&token='.newToken().'&website='.urlencode($website->ref); $url = $_SERVER["PHP_SELF"].'?action=deletesite&token='.newToken().'&website='.urlencode($website->ref);
} }
} }
print '<a href="'.$url.'" class="buttonDelete bordertransp'.($disabled ? ' disabled' : '').'"'.$disabled.' title="'.dol_escape_htmltag($title).'">'.img_picto('', 'delete', 'class=""').'<span class="hideonsmartphone paddingleft">'.$langs->trans("Delete").'</span></a>'; print '<a href="'.$url.'" class="button buttonDelete bordertransp'.($disabled ? ' disabled' : '').'"'.$disabled.' title="'.dol_escape_htmltag($title).'">'.img_picto('', 'delete', 'class=""').'<span class="hideonsmartphone paddingleft">'.$langs->trans("Delete").'</span></a>';
// Regenerate all pages // Regenerate all pages
print '<a href="'.$_SERVER["PHP_SELF"].'?action=regeneratesite&token='.newToken().'&website='.urlencode($website->ref).'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("RegenerateWebsiteContent")).'"><span class="far fa-hdd"></span></a>'; print '<a href="'.$_SERVER["PHP_SELF"].'?action=regeneratesite&token='.newToken().'&website='.urlencode($website->ref).'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("RegenerateWebsiteContent")).'"><span class="far fa-hdd"></span></a>';
@ -3353,7 +3353,7 @@ if (!GETPOST('hide_websitemenu')) {
$title = ''; $title = '';
$url = $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&pageid='.((int) $websitepage->id).'&website='.urlencode($website->ref); // action=delete for webpage, deletesite for website $url = $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&pageid='.((int) $websitepage->id).'&website='.urlencode($website->ref); // action=delete for webpage, deletesite for website
} }
print '<a href="'.$url.'" class="buttonDelete bordertransp'.($disabled ? ' disabled' : '').'"'.$disabled.' title="'.dol_escape_htmltag($title).'">'.img_picto('', 'delete', 'class=""').'<span class="hideonsmartphone paddingleft">'.$langs->trans("Delete").'</span></a>'; print '<a href="'.$url.'" class="button buttonDelete bordertransp'.($disabled ? ' disabled' : '').'"'.$disabled.' title="'.dol_escape_htmltag($title).'">'.img_picto('', 'delete', 'class=""').'<span class="hideonsmartphone paddingleft">'.$langs->trans("Delete").'</span></a>';
} }
} }