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

fix display cond

Browse Source
This commit is contained in:
John BOTELLA 2018-08-10 16:59:22 +02:00
parent 6fad0ea5bd
commit 681ae88e97
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/compta/facture/card.php
View File

@ -4001,14 +4001,12 @@ else if ($id > 0 || ! empty($ref))
} }
print '</td></tr>'; print '</td></tr>';
} }
$displayWarranty = false; $displayWarranty = false;
if( !empty($object->situation_final) if( ( $object->type == Facture::TYPE_SITUATION && (!empty($object->retained_warranty) || !empty($conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY)) ) )
&& ( $object->type == Facture::TYPE_SITUATION && (!empty($object->retained_warranty) || !empty($conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY)) )
)
{ {
// Check if this situation invoice is 100% for real // Check if this situation invoice is 100% for real
if(!empty($object->lines)){ if(!empty($object->situation_final) && !empty($object->lines)){
$displayWarranty = true; $displayWarranty = true;
foreach( $object->lines as $i => $line ){ foreach( $object->lines as $i => $line ){
if($line->product_type < 2 && $line->situation_percent < 100){ if($line->product_type < 2 && $line->situation_percent < 100){