From 142f87863357fc409e3926b2e60de08c310e5eb8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Mar 2021 18:56:16 +0100
Subject: [PATCH] Fix look and feel v13

---
 htdocs/product/price.php | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 7538e2875be..b783ad5c002 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1649,8 +1649,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		$filter['soc.nom'] = $search_soc;
 	}
 
-	if ($action == 'add_customer_price')
-	{
+	if ($action == 'add_customer_price') {
 		// Form to add a new customer price
 		$maxpricesupplier = $object->min_recommended_price();
 
@@ -1661,13 +1660,11 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '<input type="hidden" name="action" value="add_customer_price_confirm">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-		print dol_get_fiche_head();
-
 		print '<table class="liste centpercent">';
 		print '<tr>';
 		print '<td class="fieldrequired">'.$langs->trans('ThirdParty').'</td>';
 		print '<td>';
-		print $form->select_company('', 'socid', 's.client IN (1,2,3)', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
+		print img_picto('', 'company').$form->select_company('', 'socid', 's.client IN (1,2,3)', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
 		print '</td>';
 		print '</tr>';
 
@@ -1714,14 +1711,13 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 		print '</table>';
 
-		print dol_get_fiche_end();
 
 		print '<div class="center">';
 
 				// Update all child soc
 		print '<div class="marginbottomonly">';
-		print '<input type="checkbox" name="updatechildprice" value="1"> ';
-		print $langs->trans('ForceUpdateChildPriceSoc');
+		print '<input type="checkbox" name="updatechildprice" id="updatechildprice" value="1"> ';
+		print '<label for="updatechildprice">'.$langs->trans('ForceUpdateChildPriceSoc').'</label>';
 		print '</div>';
 
 		print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
@@ -1747,23 +1743,21 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '<input type="hidden" name="action" value="update_customer_price_confirm">';
 		print '<input type="hidden" name="lineid" value="'.$prodcustprice->id.'">';
 
-		print dol_get_fiche_head();
-
 		print '<table class="liste centpercent">';
 		print '<tr>';
-		print '<td class="titlefield">'.$langs->trans('ThirdParty').'</td>';
+		print '<td class="titlefield fieldrequired">'.$langs->trans('ThirdParty').'</td>';
 		$staticsoc = new Societe($db);
 		$staticsoc->fetch($prodcustprice->fk_soc);
-		print "<td colspan='2'>".$staticsoc->getNomUrl(1)."</td>";
+		print "<td>".$staticsoc->getNomUrl(1)."</td>";
 		print '</tr>';
 
 		// VAT
-		print '<tr><td>'.$langs->trans("DefaultTaxRate").'</td><td colspan="2">';
+		print '<tr><td class="fieldrequired">'.$langs->trans("DefaultTaxRate").'</td><td>';
 		print $form->load_tva("tva_tx", $prodcustprice->default_vat_code ? $prodcustprice->tva_tx.' ('.$prodcustprice->default_vat_code.')' : $prodcustprice->tva_tx, $mysoc, '', $object->id, $prodcustprice->recuperableonly, $object->type, false, 1);
 		print '</td></tr>';
 
 		// Price base
-		print '<tr><td>';
+		print '<tr><td class="fieldrequired">';
 		print $langs->trans('PriceBase');
 		print '</td>';
 		print '<td>';
@@ -1772,7 +1766,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '</tr>';
 
 		// Price
-		print '<tr><td>';
+		print '<tr><td class="fieldrequired">';
 		$text = $langs->trans('SellingPrice');
 		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
 		print '</td><td>';
@@ -1800,21 +1794,13 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		}
 		print '</tr>';
 
-		// Update all child soc
-		print '<tr><td>';
-		print '</td>';
-		print '<td>';
-		print '</td>';
-		print '</tr>';
-
 		print '</table>';
 
-		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<div class="marginbottomonly">';
-		print '<input type="checkbox" name="updatechildprice" value="1"> ';
-		print $langs->trans('ForceUpdateChildPriceSoc');
+		print '<input type="checkbox" name="updatechildprice" id="updatechildprice" value="1"> ';
+		print '<label for="updatechildprice">'.$langs->trans('ForceUpdateChildPriceSoc').'</label>';
 		print "</div>";
 
 		print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';