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 2019-12-03 22:26:33 +01:00 committed by GitHub
parent 24b5b9bd72
commit 22b17190e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1231,7 +1231,6 @@ function pdf_writelinedesc(&$pdf, $object, $i, $outputlangs, $w, $h, $posx, $pos
function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0) function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0)
{ {
global $db, $conf, $langs; global $db, $conf, $langs;
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
$idprod = (!empty($object->lines[$i]->fk_product) ? $object->lines[$i]->fk_product : false); $idprod = (!empty($object->lines[$i]->fk_product) ? $object->lines[$i]->fk_product : false);
$label = (!empty($object->lines[$i]->label) ? $object->lines[$i]->label : (!empty($object->lines[$i]->product_label) ? $object->lines[$i]->product_label : '')); $label = (!empty($object->lines[$i]->label) ? $object->lines[$i]->label : (!empty($object->lines[$i]->product_label) ? $object->lines[$i]->product_label : ''));
@ -1283,9 +1282,11 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified)) $note = $prodser->multilangs[$outputlangs->defaultlang]["note"]; if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified)) $note = $prodser->multilangs[$outputlangs->defaultlang]["note"];
} }
} }
elseif ($object->type == Facture::TYPE_DEPOSIT && $object->element == 'facture') { elseif ($object->element == 'facture' || $object->element == 'facturefourn') {
if ($object->type == $object::TYPE_DEPOSIT) {
$desc = str_replace('(DEPOSIT)', $outputlangs->trans('Deposit'), $desc); $desc = str_replace('(DEPOSIT)', $outputlangs->trans('Deposit'), $desc);
} }
}
// Description short of product line // Description short of product line
$libelleproduitservice = $label; $libelleproduitservice = $label;