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

Update commondocgenerator.class.php

Browse Source
This commit is contained in:
Laurent Destailleur 2019-01-26 14:17:01 +01:00 committed by GitHub
parent a78e406e76
commit c989b8d102
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -462,9 +462,9 @@ abstract class CommonDocGenerator
} }
// @GS: Calculate total up and total discount percentage // @GS: Calculate total up and total discount percentage
// Note that this added fields correspond to nothing in Dolibarr (Dolibarr manage discount on lines not globally)
$resarray['object_total_up'] = $totalUp; $resarray['object_total_up'] = $totalUp;
$resarray['object_total_up_locale'] = price($resarray['object_total_up'], 0, $outputlangs); $resarray['object_total_up_locale'] = price($resarray['object_total_up'], 0, $outputlangs);
if (method_exists($object, 'getTotalDiscount')) { if (method_exists($object, 'getTotalDiscount')) {
$resarray['object_total_discount'] = round(100 / $totalUp * $object->getTotalDiscount(), 2); $resarray['object_total_discount'] = round(100 / $totalUp * $object->getTotalDiscount(), 2);
$resarray['object_total_discount_locale'] = price($resarray['object_total_discount'], 0, $outputlangs); $resarray['object_total_discount_locale'] = price($resarray['object_total_discount'], 0, $outputlangs);