From c0ef63fd746e99f31eb1870e5048108441d11c68 Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Mon, 2 Dec 2013 00:22:49 +0100 Subject: [PATCH] Bteer fix --- htdocs/comm/propal.php | 4 ++-- htdocs/core/lib/pdf.lib.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 33fed6c76d1..60e29a74543 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -786,7 +786,7 @@ else if ($action == "addline" && $user->rights->propal->creer) $info_bits=0; if ($tva_npr) $info_bits |= 0x01; - + if (! empty($price_min) && (price2num($pu_ht)*(1-price2num(GETPOST('remise_percent'))/100) < price2num($price_min))) { $mesg = $langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').$langs->getCurrencySymbol($conf->currency)); @@ -920,7 +920,7 @@ else if ($action == 'updateligne' && $user->rights->propal->creer && GETPOST('sa $error++; } } - + if (! $error) { $result = $object->updateline( diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index f11a0fa7ec8..475991831e4 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -930,6 +930,7 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl } else { $desctest=$desc; } + //Test with htmlenties for update and no htmlentities for creation if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && ((strpos($desctest,$prodser->description)!==false) || (strpos($desc,$prodser->description)!==false))) {