Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 12:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix vat visiblity on pdf

Browse Source
This commit is contained in:
Laurent Destailleur
2017-09-27 21:58:42 +02:00
parent c5f30f0d80
commit 537a551bb5
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/functions.lib.php
View File

@@ -3684,7 +3684,7 @@ function print_fleche_navigation($page, $file, $options='', $nextpage=0, $betwee
* @param string $rate Rate value to format ('19.6', '19,6', '19.6%', '19,6%', '19.6 (CODEX)', ...) * @param string $rate Rate value to format ('19.6', '19,6', '19.6%', '19,6%', '19.6 (CODEX)', ...)
* @param boolean $addpercent Add a percent % sign in output * @param boolean $addpercent Add a percent % sign in output
* @param int $info_bits Miscellaneous information on vat (0=Default, 1=French NPR vat) * @param int $info_bits Miscellaneous information on vat (0=Default, 1=French NPR vat)
* @param int $usestarfornpr 1=Use '*' for NPR vat rate intead of MAIN_LABEL_MENTION_NPR * @param int $usestarfornpr -1=Never show, 0 or 1=Use '*' for NPR vat rates
* @return string String with formated amounts ('19,6' or '19,6%' or '8.5% (NPR)' or '8.5% *' or '19,6 (CODEX)') * @return string String with formated amounts ('19,6' or '19,6%' or '8.5% (NPR)' or '8.5% *' or '19,6 (CODEX)')
*/ */
function vatrate($rate, $addpercent=false, $info_bits=0, $usestarfornpr=0) function vatrate($rate, $addpercent=false, $info_bits=0, $usestarfornpr=0)
@@ -3714,7 +3714,7 @@ function vatrate($rate, $addpercent=false, $info_bits=0, $usestarfornpr=0)
// TODO Split on / and output with a price2num to have clean numbers without ton of 000. // TODO Split on / and output with a price2num to have clean numbers without ton of 000.
$ret=$rate.($addpercent?'%':''); $ret=$rate.($addpercent?'%':'');
} }
if ($info_bits & 1) $ret.=' *'; if (($info_bits & 1) && $usestarfornpr >= 0) $ret.=' *';
$ret.=$morelabel; $ret.=$morelabel;
return $ret; return $ret;
} }

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

@@ -1491,14 +1491,14 @@ function pdf_getlinevatrate($object,$i,$outputlangs,$hidedetails=0)
{ {
$tmpresult=''; $tmpresult='';
$tmpresult.=vatrate($object->lines[$i]->tva_tx, 1, $object->lines[$i]->info_bits, 1); $tmpresult.=vatrate($object->lines[$i]->tva_tx, 0, $object->lines[$i]->info_bits, -1);
if (empty($conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX)) if (empty($conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX))
{ {
if ($object->lines[$i]->total_localtax1 != 0) if ($object->lines[$i]->total_localtax1 != 0)
{ {
if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='/'; if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='/';
else $tmpresult=''; else $tmpresult='';
$tmpresult.=vatrate(abs($object->lines[$i]->localtax1_tx),1); $tmpresult.=vatrate(abs($object->lines[$i]->localtax1_tx), 0);
} }
} }
if (empty($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX)) if (empty($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX))
@@ -1507,9 +1507,10 @@ function pdf_getlinevatrate($object,$i,$outputlangs,$hidedetails=0)
{ {
if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='/'; if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='/';
else $tmpresult=''; else $tmpresult='';
$tmpresult.=vatrate(abs($object->lines[$i]->localtax2_tx),1); $tmpresult.=vatrate(abs($object->lines[$i]->localtax2_tx), 0);
} }
} }
$tmpresult.= '%';
$result.=$tmpresult; $result.=$tmpresult;
} }

6
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@@ -140,7 +140,7 @@ class pdf_einstein extends ModelePDFCommandes
} }
else else
{ {
$this->posxtva=112; $this->posxtva=110;
$this->posxup=126; $this->posxup=126;
$this->posxqty=145; $this->posxqty=145;
} }
@@ -431,8 +431,8 @@ class pdf_einstein extends ModelePDFCommandes
if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
{ {
$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails); $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
$pdf->SetXY($this->posxtva, $curY); $pdf->SetXY($this->posxtva-5, $curY);
$pdf->MultiCell($this->posxup-$this->posxtva-0.8, 3, $vat_rate, 0, 'R'); $pdf->MultiCell($this->posxup-$this->posxtva+4, 3, $vat_rate, 0, 'R');
} }
// Unit price before discount // Unit price before discount

6
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@@ -125,7 +125,7 @@ class pdf_crabe extends ModelePDFFactures
} }
else else
{ {
$this->posxtva=112; $this->posxtva=110;
$this->posxup=126; $this->posxup=126;
$this->posxqty=145; $this->posxqty=145;
} }
@@ -496,8 +496,8 @@ class pdf_crabe extends ModelePDFFactures
if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
{ {
$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails); $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
$pdf->SetXY($this->posxtva, $curY); $pdf->SetXY($this->posxtva-5, $curY);
$pdf->MultiCell($this->posxup-$this->posxtva-0.8, 3, $vat_rate, 0, 'R'); $pdf->MultiCell($this->posxup-$this->posxtva+4, 3, $vat_rate, 0, 'R');
} }
// Unit price before discount // Unit price before discount

7
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@@ -114,7 +114,7 @@ class pdf_azur extends ModelePDFPropales
} }
else else
{ {
$this->posxtva=112; $this->posxtva=110;
$this->posxup=126; $this->posxup=126;
$this->posxqty=145; $this->posxqty=145;
} }
@@ -505,8 +505,8 @@ class pdf_azur extends ModelePDFPropales
if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
{ {
$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails); $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
$pdf->SetXY($this->posxtva, $curY); $pdf->SetXY($this->posxtva-5, $curY);
$pdf->MultiCell($this->posxup-$this->posxtva-0.8, 3, $vat_rate, 0, 'R'); $pdf->MultiCell($this->posxup-$this->posxtva+4, 3, $vat_rate, 0, 'R');
} }
// Unit price before discount // Unit price before discount
@@ -1310,6 +1310,7 @@ class pdf_azur extends ModelePDFPropales
$pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height); $pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
if (empty($hidetop)) if (empty($hidetop))
{ {
// Not do -3 and +3 instead of -1 -1 to have more space for text 'Sales tax'
$pdf->SetXY($this->posxtva-3, $tab_top+1); $pdf->SetXY($this->posxtva-3, $tab_top+1);
$pdf->MultiCell($this->posxup-$this->posxtva+3,2, $outputlangs->transnoentities("VAT"),'','C'); $pdf->MultiCell($this->posxup-$this->posxtva+3,2, $outputlangs->transnoentities("VAT"),'','C');
} }