Laurent Destailleur 2 年之前
父節點
當前提交
9319f56599

+ 2 - 2
htdocs/asset/tpl/linkedobjectblock.tpl.php

@@ -46,12 +46,12 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		$trclass .= ' liste_sub_total';
 	}
 	echo '<tr class="'.$trclass.'" >';
-	echo '<td class="linkedcol-element" >'.$langs->trans("Asset");
+	echo '<td class="linkedcol-element tdoverflowmax100">'.$langs->trans("Asset");
 	if (!empty($showImportButton) && !empty($conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)) {
 		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
 	}
 	echo '</td>';
-	echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+	echo '<td class="linkedcol-name tdoverflowmax150" >'.$objectlink->getNomUrl(1).'</td>';
 	echo '<td class="linkedcol-ref" align="center">'.$objectlink->label.'</td>';
 	echo '<td class="linkedcol-date" align="center">'.dol_print_date($objectlink->date_start, 'day').'</td>';
 	echo '<td class="linkedcol-amount right">';

+ 2 - 2
htdocs/bom/tpl/linkedobjectblock.tpl.php

@@ -47,12 +47,12 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		$trclass .= ' liste_sub_total';
 	}
 	echo '<tr class="'.$trclass.'" >';
-	echo '<td class="linkedcol-element" >'.$langs->trans("Bom");
+	echo '<td class="linkedcol-element tdoverflowmax100">'.$langs->trans("Bom");
 	if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
 		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
 	}
 	echo '</td>';
-	echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+	echo '<td class="linkedcol-name tdoverflowmax150" >'.$objectlink->getNomUrl(1).'</td>';
 
 	echo '<td class="linkedcol-ref">';
 	$result = $product_static->fetch($objectlink->fk_product);

+ 2 - 2
htdocs/comm/propal/tpl/linkedobjectblock.tpl.php

@@ -52,13 +52,13 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		$trclass .= ' liste_sub_total';
 	}
 	print '<tr class="'.$trclass.'"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'" >';
-	print '<td class="linkedcol-element" >'.$langs->trans("Proposal");
+	print '<td class="linkedcol-element tdoverflowmax100">'.$langs->trans("Proposal");
 	if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
 		$url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$objectlink->id;
 		print '<a class="objectlinked_importbtn" href="'.$url.'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a>';
 	}
 	print '</td>';
-	print '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+	print '<td class="linkedcol-name tdoverflowmax150">'.$objectlink->getNomUrl(1).'</td>';
 	print '<td class="linkedcol-ref" >'.$objectlink->ref_client.'</td>';
 	print '<td class="linkedcol-date center">'.dol_print_date($objectlink->date, 'day').'</td>';
 	print '<td class="linkedcol-amount right">';

+ 2 - 2
htdocs/commande/tpl/linkedobjectblock.tpl.php

@@ -46,12 +46,12 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		$trclass .= ' liste_sub_total';
 	}
 	echo '<tr class="'.$trclass.'" >';
-	echo '<td class="linkedcol-element" >'.$langs->trans("CustomerOrder");
+	echo '<td class="linkedcol-element tdoverflowmax100">'.$langs->trans("CustomerOrder");
 	if (!empty($showImportButton) && !empty($conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)) {
 		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
 	}
 	echo '</td>';
-	echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+	echo '<td class="linkedcol-name tdoverflowmax150" >'.$objectlink->getNomUrl(1).'</td>';
 	echo '<td class="linkedcol-ref">'.$objectlink->ref_client.'</td>';
 	echo '<td class="linkedcol-date center">'.dol_print_date($objectlink->date, 'day').'</td>';
 	echo '<td class="linkedcol-amount right">';

+ 1 - 1
htdocs/compta/facture/tpl/linkedobjectblock.tpl.php

@@ -67,7 +67,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 			break;
 	}
 	print '</td>';
-	print '<td class="linkedcol-name nowraponall">'.$objectlink->getNomUrl(1).'</td>';
+	print '<td class="linkedcol-name tdoverflowmax150">'.$objectlink->getNomUrl(1).'</td>';
 	print '<td class="linkedcol-ref left">'.$objectlink->ref_client.'</td>';
 	print '<td class="linkedcol-date center">'.dol_print_date($objectlink->date, 'day').'</td>';
 	print '<td class="linkedcol-amount right">';

+ 1 - 1
htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php

@@ -47,7 +47,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	?>
 <tr class="<?php echo $trclass; ?>" >
 	<td class="linkedcol-element tdoverflowmax100"><?php echo $langs->trans("RepeatableInvoice"); ?></td>
-	<td class="linkedcol-name"><!-- nowraponall because ref is a label --><?php echo $objectlink->getNomUrl(1); ?></td>
+	<td class="linkedcol-name tdoverflowmax150"><?php echo $objectlink->getNomUrl(1); ?></td>
 	<td class="linkedcol-ref" align="center"></td>
 	<td class="linkedcol-date" align="center"><?php echo dol_print_date($objectlink->date_when, 'day'); ?></td>
 	<td class="linkedcol-amount right"><?php

+ 6 - 6
htdocs/mrp/tpl/linkedobjectblock.tpl.php

@@ -51,17 +51,17 @@ if ($object->element == 'mo') {
 		$trclass = 'oddeven';
 
 		echo '<tr class="' . $trclass . '" >';
-		echo '<td class="linkedcol-element" >' . $langs->trans("ManufacturingOrder");
+		echo '<td class="linkedcol-element tdoverflowmax100">' . $langs->trans("ManufacturingOrder");
 		if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
 			print '<a class="objectlinked_importbtn" href="' . $objectlink->getNomUrl(0, '', 0, 1) . '&amp;action=selectlines" data-element="' . $objectlink->element . '" data-id="' . $objectlink->id . '"  > <i class="fa fa-indent"></i> </a';
 		}
 		echo '</td>';
-		echo '<td class="linkedcol-name nowraponall" >' . $objectlink->getNomUrl(1) . '</td>';
+		echo '<td class="linkedcol-name tdoverflowmax150">' . $objectlink->getNomUrl(1) . '</td>';
 
-		echo '<td class="linkedcol-ref" align="center">';
+		echo '<td class="linkedcol-ref center">';
 		//  $result = $product_static->fetch($objectlink->fk_product);
 		print '</td>';
-		echo '<td class="linkedcol-date" align="center">' . dol_print_date($objectlink->date_creation, 'day') . '</td>';
+		echo '<td class="linkedcol-date center">' . dol_print_date($objectlink->date_creation, 'day') . '</td>';
 		echo '<td class="linkedcol-amount right">-</td>';
 		echo '<td class="linkedcol-statut right">' . $objectlink->getLibStatut(3) . '</td>';
 		echo '<td class="linkedcol-action right">';
@@ -93,14 +93,14 @@ if ($object->element == 'mo') {
 			$trclass .= ' liste_sub_total';
 		}
 		print '<tr class="'.$trclass.'"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'" >';
-		print '<td class="linkedcol-element" >'.$langs->trans("ManufacturingOrder");
+		print '<td class="linkedcol-element tdoverflowmax100">'.$langs->trans("ManufacturingOrder");
 		if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
 			$url = DOL_URL_ROOT.'/mrp/mo_card.php?id='.$objectlink->id;
 			print '<a class="objectlinked_importbtn" href="'.$url.'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a>';
 		}
 		print '</td>';
 
-		print '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+		print '<td class="linkedcol-name tdoverflowmax150">'.$objectlink->getNomUrl(1).'</td>';
 		print '<td class="linkedcol-ref" >'.$objectlink->ref_client.'</td>';
 		print '<td class="linkedcol-date center">'.dol_print_date($objectlink->date_start_planned, 'day').'</td>';
 		print '<td class="linkedcol-amount right">-</td>';

+ 2 - 2
htdocs/reception/tpl/linkedobjectblock.tpl.php

@@ -50,12 +50,12 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	}
 	?>
 	<tr class="<?php echo $trclass; ?>">
-		<td class="linkedcol-element"><?php echo $langs->trans("Reception"); ?>
+		<td class="linkedcol-element tdoverflowmax100"><?php echo $langs->trans("Reception"); ?>
 		<?php if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
 			print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
 		} ?>
 		</td>
-		<td class="linkedcol-name nowraponall" ><?php echo $objectlink->getNomUrl(1); ?></td>
+		<td class="linkedcol-name tdoverflowmax150"><?php echo $objectlink->getNomUrl(1); ?></td>
 		<td class="linkedcol-ref tdoverflowmax100" title="<?php echo dol_escape_htmltag($objectlink->ref_supplier); ?>"><?php echo dol_escape_htmltag($objectlink->ref_supplier); ?></td>
 		<td class="linkedcol-date"><?php echo dol_print_date($objectlink->date_delivery, 'day'); ?></td>
 		<td class="linkedcol-amount right"><?php

+ 3 - 0
htdocs/theme/eldy/global.inc.php

@@ -1505,6 +1505,9 @@ table[summary="list_of_modules"] .fa-cog {
 .linkedcol-element {
 	min-width: 100px;
 }
+.linkedcol-amount {
+	white-space: nowrap;
+}
 
 .img-skinthumb {
 	width: 160px;

+ 3 - 1
htdocs/theme/md/style.css.php

@@ -1594,7 +1594,9 @@ table[summary="list_of_modules"] .fa-cog {
 .linkedcol-element {
 	min-width: 100px;
 }
-
+.linkedcol-amount {
+	white-space: nowrap;
+}
 .linkedcol-date {
 	text-align: center;
 }

+ 2 - 2
htdocs/ticket/tpl/linkedobjectblock.tpl.php

@@ -46,12 +46,12 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	}
 	?>
 	<tr class="<?php echo $trclass; ?>" >
-		<td class="linkedcol-element" ><?php echo $langs->trans("Ticket"); ?>
+		<td class="linkedcol-element tdoverflowmax100"><?php echo $langs->trans("Ticket"); ?>
 		<?php if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
 			print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
 		} ?>
 		</td>
-		<td class="linkedcol-name nowraponall" ><?php echo $objectlink->getNomUrl(1); ?></td>
+		<td class="linkedcol-name tdoverflowmax150"><?php echo $objectlink->getNomUrl(1); ?></td>
 		<td class="linkedcol-ref center"><?php echo $objectlink->ref_client; ?></td>
 		<td class="linkedcol-date center"><?php echo dol_print_date($objectlink->datec, 'day'); ?></td>
 		<?php