From f708d2e184da8b2ab6c59fa002aa88f881965571 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 30 Dec 2024 03:26:15 +0100
Subject: [PATCH] Debug v21

---
 htdocs/margin/checkMargins.php   | 39 +++++++++++++++++++++++++++-----
 htdocs/margin/productMargins.php |  2 +-
 htdocs/theme/eldy/global.inc.php |  2 +-
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 391d12958bc..8f71eb09bb9 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -282,26 +282,39 @@ if ($result) {
 	print '<table class="tagtable noborder nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre liste_titre_search">';
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="liste_titre center">';
+		$searchpitco = $form->showFilterButtons();
+		print $searchpitco;
+		print '</td>';
+	}
 	print '<td><input type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
 	print '<td></td>';
 	print '<td></td>';
 	print '<td></td>';
 	print '<td></td>';
 	print '<td></td>';
-	print '<td class="liste_titre center">';
-	$searchpitco = $form->showFilterButtons();
-	print $searchpitco;
-	print '</td>';
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="liste_titre center">';
+		$searchpitco = $form->showFilterButtons();
+		print $searchpitco;
+		print '</td>';
+	}
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
+	}
 	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("UnitPriceHT", $_SERVER["PHP_SELF"], "d.subprice", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "d.buy_price_ht", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "d.qty", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], "d.total_ht", "", $param, '', $sortfield, $sortorder, 'right ');
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
+	}
 	print "</tr>\n";
 
 	$i = 0;
@@ -309,6 +322,11 @@ if ($result) {
 		$objp = $db->fetch_object($result);
 
 		print '<tr class="oddeven">';
+
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td></td>';
+		}
+
 		print '<td>';
 		$result_inner = $invoicestatic->fetch($objp->invoiceid);
 		if ($result_inner < 0) {
@@ -349,13 +367,22 @@ if ($result) {
 		print '<td class="right">';
 		print '<span class="amount">'.price($objp->total_ht).'</span>';
 		print '</td>';
-		print '<td></td>';
+
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td></td>';
+		}
 
 		print "</tr>\n";
 
 		$i++;
 	}
 
+	if ($num == 0) {
+		print '<tr class=""><td colspan="7">';
+		print '<span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span>';
+		print '</td></tr>';
+	}
+
 	print "</table>";
 
 	print "</div>";
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 97d1a5a3f92..dac098bf848 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -126,7 +126,7 @@ print '<table class="border centpercent">';
 // Product
 print '<tr><td class="titlefield">'.$langs->trans('ProductOrService').'</td>';
 print '<td class="maxwidthonsmartphone" colspan="4">';
-print img_picto('', 'product').$form->select_produits(($id > 0 ? $id : ''), 'id', '', 20, 0, 1, 2, '', 1, array(), 0, 'All', 0, '', 0, '', null, 1);
+print img_picto('', 'product', 'class="pictofixedwidth"').$form->select_produits(($id > 0 ? $id : ''), 'id', '', 20, 0, 1, 2, '', 1, array(), 0, '', 0, '', 0, '', null, 1);
 print '</td></tr>';
 
 // Categories
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index e6b4e156a26..1262a2c50b6 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -5613,7 +5613,7 @@ table.table-fiche-title .col-title div.titre > span:not(.print-barre-liste) {
 }
 
 table.table-fiche-title, div.fiche>table.table-fiche-title {
-	margin-bottom: 18px;
+	margin-bottom: 12px;
 }
 .table-list-of-attached-files, .table-list-of-links {
 	margin-bottom: 0 !important;