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

FIX #7786

Browse Source
This commit is contained in:
Laurent Destailleur 2017-11-12 20:12:56 +01:00
parent 6eb2204c2b
commit 356525730d
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1841,10 +1841,14 @@ function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookm
if ($object->lines[$i]->special_code == 3) return ''; if ($object->lines[$i]->special_code == 3) return '';
if (empty($hidedetails) || $hidedetails > 1) if (empty($hidedetails) || $hidedetails > 1)
{ {
if($conf->global->SITUATION_DISPLAY_DIFF_ON_PDF) if ($conf->global->SITUATION_DISPLAY_DIFF_ON_PDF)
{ {
$prev_progress = $object->lines[$i]->get_prev_progress($object->id); $prev_progress = 0;
$result = ( $object->lines[$i]->situation_percent - $prev_progress) . '%'; if (method_exists($object, 'get_prev_progress'))
{
$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
}
$result = ($object->lines[$i]->situation_percent - $prev_progress) . '%';
} }
else else
$result = $object->lines[$i]->situation_percent . '%'; $result = $object->lines[$i]->situation_percent . '%';
@ -1891,12 +1895,17 @@ function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0)
if (empty($hidedetails) || $hidedetails > 1) if (empty($hidedetails) || $hidedetails > 1)
{ {
$total_ht = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht); $total_ht = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);
if ($object->lines[$i]->situation_percent > 0 ) if ($object->lines[$i]->situation_percent > 0)
{ {
$prev_progress = $object->lines[$i]->get_prev_progress($object->id); $prev_progress = 0;
$progress = ( $object->lines[$i]->situation_percent - $prev_progress) /100; $progress = 1;
$result.=price($sign * ($total_ht/($object->lines[$i]->situation_percent/100)) * $progress, 0, $outputlangs); if (method_exists($object, 'get_prev_progress'))
} {
$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
$progress = ($object->lines[$i]->situation_percent - $prev_progress) / 100;
}
$result.=price($sign * ($total_ht/($object->lines[$i]->situation_percent/100)) * $progress, 0, $outputlangs);
}
else else
$result.=price($sign * $total_ht, 0, $outputlangs); $result.=price($sign * $total_ht, 0, $outputlangs);
} }