Laurent Destailleur 3 年之前
父节点
当前提交
5dfd5ed444

+ 2 - 2
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 "</td>\n";
 				print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($objp->label).'">'.dol_escape_htmltag($objp->label).'</td>';
-				print "<td>";
-				print dol_print_date($db->jdate($objp->datem), 'day');
+				print '<td title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($db->jdate($objp->datem), 'dayhour', 'tzuserrel')).'">';
+				print dol_print_date($db->jdate($objp->datem), 'day', 'tzuserrel');
 				print "</td>";
 				// Sell price
 				if (empty($conf->global->PRODUIT_MULTIPRICES)) {

+ 1 - 1
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('<span class="opacitymedium">'.$langs->trans("Variable").'</span>', $htmltext);
 		}
 		print '</td>';
 		if (!$i) {

+ 1 - 1
htdocs/product/stock/massstockmove.php

@@ -484,7 +484,7 @@ print '</span>';
 
 print '<input type="file" name="userfile" size="20" maxlength="80"> &nbsp; &nbsp; ';
 $out = (empty($conf->global->MAIN_UPLOAD_DOC) ? ' disabled' : '');
-print '<input type="submit" class="button" value="'.$langs->trans("ImportFromCSV").'"'.$out.' name="sendit">';
+print '<input type="submit" class="button small" value="'.$langs->trans("ImportFromCSV").'"'.$out.' name="sendit">';
 $out = '';
 if (!empty($conf->global->MAIN_UPLOAD_DOC)) {
 	$max = $conf->global->MAIN_UPLOAD_DOC; // In Kb

+ 10 - 8
htdocs/product/stock/replenishorders.php

@@ -225,10 +225,10 @@ if ($resql) {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" name="search_user" value="'.dol_escape_htmltag($suser).'">';
 	print '</td>';
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" name="search_ttc" value="'.dol_escape_htmltag($sttc).'">';
+	print '<td class="liste_titre right">';
+	print '<input type="text" class="flat width75" name="search_ttc" value="'.dol_escape_htmltag($sttc).'">';
 	print '</td>';
-	print '<td class="liste_titre">';
+	print '<td class="liste_titre center">';
 	print $form->selectDate($search_date, 'search_date', 0, 0, 1, '', 1, 0, 0, '');
 	print '</td>';
 	print '<td class="liste_titre right">';
@@ -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 '<td>'.$txt.'</td>';
 
 			// Amount
-			print '<td>'.price($obj->total_ttc).'</td>';
+			print '<td class="right"><span class="amount">'.price($obj->total_ttc).'</span></td>';
 
 			// 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 '<td>'.$date.'</td>';
+			print '<td class="center">'.$date.'</td>';
 
 			// Statut
 			print '<td class="right">'.$commandestatic->LibStatut($obj->fk_statut, 5).'</td>';

+ 2 - 2
htdocs/product/stock/stockatdate.php

@@ -565,7 +565,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			// PMP value
 			print '<td class="right">';
 			if (price2num($objp->estimatedvalue, 'MT')) {
-				print price(price2num($objp->estimatedvalue, 'MT'), 1);
+				print '<span class="amount">'.price(price2num($objp->estimatedvalue, 'MT'), 1).'</span>';
 			} 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('<span class="opacitymedium">'.$langs->trans("Variable").'</span>', $htmltext);
 			}
 			print'</td>';
 

+ 3 - 3
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 = '';

+ 2 - 2
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 {