|
@@ -1844,10 +1844,14 @@ function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookm
|
|
|
if ($object->lines[$i]->special_code == 3) return '';
|
|
|
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);
|
|
|
- $result = ( $object->lines[$i]->situation_percent - $prev_progress) . '%';
|
|
|
+ $prev_progress = 0;
|
|
|
+ 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
|
|
|
$result = $object->lines[$i]->situation_percent . '%';
|
|
@@ -1894,12 +1898,17 @@ function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0)
|
|
|
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);
|
|
|
- if ($object->lines[$i]->situation_percent > 0 )
|
|
|
+ if ($object->lines[$i]->situation_percent > 0)
|
|
|
{
|
|
|
- $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);
|
|
|
- }
|
|
|
+ $prev_progress = 0;
|
|
|
+ $progress = 1;
|
|
|
+ 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
|
|
|
$result.=price($sign * $total_ht, 0, $outputlangs);
|
|
|
}
|