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

NEW Add detail of all tax rates into pdf column tax sale.

Browse Source
This commit is contained in:
Laurent Destailleur 2017-08-29 17:22:03 +02:00
parent d96a83adac
commit e862ba9daf
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1470,7 +1470,7 @@ function pdf_getlineref_supplier($object,$i,$outputlangs,$hidedetails=0)
*/ */
function pdf_getlinevatrate($object,$i,$outputlangs,$hidedetails=0) function pdf_getlinevatrate($object,$i,$outputlangs,$hidedetails=0)
{ {
global $hookmanager; global $conf, $hookmanager, $mysoc;
$result=''; $result='';
$reshook=0; $reshook=0;
@ -1487,7 +1487,32 @@ function pdf_getlinevatrate($object,$i,$outputlangs,$hidedetails=0)
} }
if (empty($reshook)) if (empty($reshook))
{ {
if (empty($hidedetails) || $hidedetails > 1) $result.=vatrate($object->lines[$i]->tva_tx,1,$object->lines[$i]->info_bits,1); if (empty($hidedetails) || $hidedetails > 1)
{
$tmpresult='';
$tmpresult.=vatrate($object->lines[$i]->tva_tx,1,$object->lines[$i]->info_bits,1);
if (empty($conf->PDF_MAIN_HIDE_SECOND_TAX))
{
if ($object->lines[$i]->total_localtax1 != 0)
{
if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='+';
else $tmpresult='';
$tmpresult.=vatrate(abs($object->lines[$i]->total_localtax1),1);
}
}
if (empty($conf->PDF_MAIN_HIDE_THIRD_TAX))
{
if ($object->lines[$i]->total_localtax2 != 0)
{
if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='+';
else $tmpresult='';
$tmpresult.=vatrate(abs($object->lines[$i]->total_localtax2),1);
}
}
$result.=$tmpresult;
}
} }
return $result; return $result;
} }