diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index ce7536553a4..051dec55ad3 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1046,10 +1046,6 @@ if ($_GET['propalid'] > 0) print ''.$langs->trans('Description').''; if ($conf->global->PRODUIT_USE_MARKUP) { - if ($_GET["action"] == 'editmarkup') - { - print ''.$langs->trans('PuchasePrice').''; - } print ''.$langs->trans('Markup').''; } print ''.$langs->trans('VAT').''; @@ -1067,7 +1063,7 @@ if ($_GET['propalid'] > 0) $var=!$var; // Ligne en mode visu - if (($_GET['action'] != 'editline' && $_GET['action'] != 'editmarkup') || $_GET['ligne'] != $objp->rowid) + if ($_GET['action'] != 'editline' || $_GET['ligne'] != $objp->rowid) { print ''; if ($objp->fk_product > 0) @@ -1085,7 +1081,7 @@ if ($_GET['propalid'] > 0) } else { - print $html->textwithtooltip($text,$objp->description,3,'','',$i,500,100,$objp->ref.' - '.nl2br(stripslashes($objp->product))); + print $html->textwithtooltip($text,$objp->description,4,'','',$i,500,100,$objp->ref.' - '.nl2br(stripslashes($objp->product))); } print_date_range($objp->date_start,$objp->date_end); @@ -1176,7 +1172,7 @@ if ($_GET['propalid'] > 0) $picto = ''; $picto.= img_calc(); $picto.= ''; - print $html->textwithtooltip($picto,$langs->trans("ToCalculateMarkup"),4,'','',$i); + print $html->textwithtooltip($picto,$langs->trans("ToCalculateMarkup"),3,'','',$i); } print ''; print ''.vatrate($objp->marge_tx).'% ';