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

Update pdf.lib.php

Browse Source
This commit is contained in:
Laurent Destailleur 2021-12-09 17:25:06 +01:00 committed by GitHub
parent abd984bc14
commit baabfd380f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1413,9 +1413,6 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
$discount->fetch($object->lines[$i]->fk_remise_except); $discount->fetch($object->lines[$i]->fk_remise_except);
$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid", $discount->ref_invoice_supplier_source); $libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid", $discount->ref_invoice_supplier_source);
} else { } else {
if (dol_textishtml($libelleproduitservice) && !dol_textishtml($desc)) {
$desc = str_replace("\n", '<br>', $desc);
}
if ($idprod) { if ($idprod) {
// Check if description must be output // Check if description must be output
if (!empty($object->element)) { if (!empty($object->element)) {
@ -1431,12 +1428,12 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
if (!empty($conf->global->HIDE_LABEL_VARIANT_PDF) && $prodser->isVariant()) { if (!empty($conf->global->HIDE_LABEL_VARIANT_PDF) && $prodser->isVariant()) {
$libelleproduitservice = $desc; $libelleproduitservice = $desc;
} else { } else {
$libelleproduitservice .= $desc; $libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
} }
} }
} }
} else { } else {
$libelleproduitservice .= $desc; $libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
} }
} }
} }