lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bteer fix

Browse Source
This commit is contained in:
Florian Henry 2013-12-02 00:22:49 +01:00
parent ff9c84fd0e
commit c0ef63fd74
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/propal.php
View File

@ -786,7 +786,7 @@ else if ($action == "addline" && $user->rights->propal->creer)
$info_bits=0; $info_bits=0;
if ($tva_npr) $info_bits |= 0x01; if ($tva_npr) $info_bits |= 0x01;
if (! empty($price_min) && (price2num($pu_ht)*(1-price2num(GETPOST('remise_percent'))/100) < price2num($price_min))) 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)); $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++; $error++;
} }
} }
if (! $error) if (! $error)
{ {
$result = $object->updateline( $result = $object->updateline(

1
htdocs/core/lib/pdf.lib.php
View File

@ -930,6 +930,7 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
} else { } else {
$desctest=$desc; $desctest=$desc;
} }
//Test with htmlenties for update and no htmlentities for creation
if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) &&
((strpos($desctest,$prodser->description)!==false) || ((strpos($desctest,$prodser->description)!==false) ||
(strpos($desc,$prodser->description)!==false))) { (strpos($desc,$prodser->description)!==false))) {