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

Other fix

Browse Source
This commit is contained in:
florian HENRY 2017-08-18 11:35:20 +02:00
parent c793e847bc
commit 874d61bb6d
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/core/class/commondocgenerator.class.php
View File

@ -419,17 +419,20 @@ abstract class CommonDocGenerator
} }
// Add vat by rates // Add vat by rates
foreach ($object->lines as $line) if (is_array($object->lines) && count($object->lines)>0)
{ {
// $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward comaptibility foreach ($object->lines as $line)
if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0; {
$resarray[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva; // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward comaptibility
$resarray[$array_key.'_total_vat_locale_'.$line->tva_tx]=price($resarray[$array_key.'_total_vat_'.$line->tva_tx]); if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0;
// $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example) $resarray[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
$vatformated=vatrate($line->tva_tx); $resarray[$array_key.'_total_vat_locale_'.$line->tva_tx]=price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated]=0; // $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
$resarray[$array_key.'_total_vat_'.$vatformated]+=$line->total_tva; $vatformated=vatrate($line->tva_tx);
$resarray[$array_key.'_total_vat_locale_'.$vatformated]=price($resarray[$array_key.'_total_vat_'.$vatformated]); if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated]=0;
$resarray[$array_key.'_total_vat_'.$vatformated]+=$line->total_tva;
$resarray[$array_key.'_total_vat_locale_'.$vatformated]=price($resarray[$array_key.'_total_vat_'.$vatformated]);
}
} }
// Retrieve extrafields // Retrieve extrafields
if (is_array($object->array_options) && count($object->array_options)) if (is_array($object->array_options) && count($object->array_options))