Fix situation invoice
This commit is contained in:
parent
b28c19d48d
commit
3379457ed7
2 changed files with 4 additions and 2 deletions
|
|
@ -1021,7 +1021,7 @@ class FactureLigne extends CommonInvoiceLine
|
|||
$invoicecache[$invoiceid] = new Facture($this->db);
|
||||
$invoicecache[$invoiceid]->fetch($invoiceid);
|
||||
}
|
||||
if ($invoicecache[$invoiceid]->type != Facture::TYPE_SITUATION) {
|
||||
if (!$invoicecache[$invoiceid]->isSituationInvoice()) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -348,7 +348,9 @@ $coldisplay++;
|
|||
$old_fieldv = $line->getAllPrevProgress($line->fk_facture);
|
||||
$fieldv = $tmp_fieldv + $old_fieldv;
|
||||
|
||||
print '<td class="nowrap right linecolcycleref"><input class="right" type="text" size="1" value="'.$fieldv.'" name="progress">%</td>';
|
||||
print '<td class="nowrap right linecolcycleref"><input class="right" type="text" size="1" value="'.$fieldv.'" name="progress">%';
|
||||
print ' '.$form->textwithpicto('', $langs->trans("PreviousProgress").' ('.$old_fieldv.'%)');
|
||||
print '</td>';
|
||||
} else {
|
||||
print '<td class="nowrap right linecolcycleref"><input class="right" type="text" size="1" value="' . (GETPOSTISSET('progress') ? GETPOST('progress') : $line->situation_percent) . '" name="progress">%</td>';
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue