diff --git a/htdocs/product/index.php b/htdocs/product/index.php index cfdbddc875c..40141fce304 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -360,8 +360,8 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us print $product_static->getNomUrl(1, '', 16); print "\n"; print ''.dol_escape_htmltag($objp->label).''; - print ""; - print dol_print_date($db->jdate($objp->datem), 'day'); + print 'jdate($objp->datem), 'dayhour', 'tzuserrel')).'">'; + print dol_print_date($db->jdate($objp->datem), 'day', 'tzuserrel'); print ""; // Sell price if (empty($conf->global->PRODUIT_MULTIPRICES)) { diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php index 93c963e0065..4271ac5d8c2 100644 --- a/htdocs/product/stock/list.php +++ b/htdocs/product/stock/list.php @@ -677,7 +677,7 @@ while ($i < min($num, $limit)) { } } else { $htmltext = $langs->trans("OptionMULTIPRICESIsOn"); - print $form->textwithtooltip($langs->trans("Variable"), $htmltext); + print $form->textwithtooltip(''.$langs->trans("Variable").'', $htmltext); } print ''; if (!$i) { diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php index b6abd4b153a..e77d87aafd3 100644 --- a/htdocs/product/stock/massstockmove.php +++ b/htdocs/product/stock/massstockmove.php @@ -484,7 +484,7 @@ print ''; print '     '; $out = (empty($conf->global->MAIN_UPLOAD_DOC) ? ' disabled' : ''); -print ''; +print ''; $out = ''; if (!empty($conf->global->MAIN_UPLOAD_DOC)) { $max = $conf->global->MAIN_UPLOAD_DOC; // In Kb diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php index 1eba8556753..a78694bf830 100644 --- a/htdocs/product/stock/replenishorders.php +++ b/htdocs/product/stock/replenishorders.php @@ -225,10 +225,10 @@ if ($resql) { print ''; print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; - print ''; + print ''; print $form->selectDate($search_date, 'search_date', 0, 0, 1, '', 1, 0, 0, ''); print ''; print ''; @@ -276,7 +276,8 @@ if ($resql) { $param, '', $sortfield, - $sortorder + $sortorder, + 'right ' ); print_liste_field_titre( 'OrderCreation', @@ -286,7 +287,8 @@ if ($resql) { $param, '', $sortfield, - $sortorder + $sortorder, + 'center ' ); print_liste_field_titre( 'Status', @@ -333,15 +335,15 @@ if ($resql) { print ''.$txt.''; // Amount - print ''.price($obj->total_ttc).''; + print ''.price($obj->total_ttc).''; // Date if ($obj->dc) { - $date = dol_print_date($db->jdate($obj->dc), 'dayhour'); + $date = dol_print_date($db->jdate($obj->dc), 'dayhour', 'tzuserrel'); } else { $date = '-'; } - print ''.$date.''; + print ''.$date.''; // Statut print ''.$commandestatic->LibStatut($obj->fk_statut, 5).''; diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php index 26991915c2f..d4f1bbf4861 100644 --- a/htdocs/product/stock/stockatdate.php +++ b/htdocs/product/stock/stockatdate.php @@ -565,7 +565,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) { // PMP value print ''; if (price2num($objp->estimatedvalue, 'MT')) { - print price(price2num($objp->estimatedvalue, 'MT'), 1); + print ''.price(price2num($objp->estimatedvalue, 'MT'), 1).''; } else { print ''; } @@ -578,7 +578,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) { print price(price2num($objp->sellvalue, 'MT'), 1); } else { $htmltext = $langs->trans("OptionMULTIPRICESIsOn"); - print $form->textwithtooltip($langs->trans("Variable"), $htmltext); + print $form->textwithtooltip(''.$langs->trans("Variable").'', $htmltext); } print''; diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php index 382503ed430..1ef64555133 100644 --- a/htdocs/resource/list.php +++ b/htdocs/resource/list.php @@ -143,8 +143,8 @@ $form = new Form($db); //$help_url="EN:Module_MyObject|FR:Module_MyObject_FR|ES:Módulo_MyObject"; $help_url = ''; -$pagetitle = $langs->trans('ResourcePageIndex'); -llxHeader('', $pagetitle, $help_url); +$title = $langs->trans('Resources'); +llxHeader('', $title, $help_url); $sql = ''; @@ -219,7 +219,7 @@ if ($ret == -1) { $newcardbutton .= dolGetButtonTitle($langs->trans('MenuResourceAdd'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/resource/card.php?action=create'); } - print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $ret + 1, $nbtotalofrecords, 'object_resource', 0, $newcardbutton, '', $limit, 0, 0, 1); + print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $ret + 1, $nbtotalofrecords, 'object_resource', 0, $newcardbutton, '', $limit, 0, 0, 1); } $moreforfilter = ''; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 7a19d28fb5b..19abdd3ba9b 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -3575,8 +3575,8 @@ div .tdtop:not(.tagtdnote) { vertical-align: top !important; /*padding-top: 10px !important; padding-bottom: 2px !important; */ - padding-top: 6px !important; - padding-bottom: 4px !important; + padding-top: 5px !important; + padding-bottom: 0px !important; } table.border td, table.bordernooddeven td, div.border div div.tagtd {