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

Fix retained warranty delay on list

Browse Source
This commit is contained in:
John BOTELLA 2018-10-04 12:01:24 +02:00
parent cf89b850ee
commit 0b3d09fa64
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/compta/facture/class/facture.class.php
View File

@ -4282,7 +4282,6 @@ class Facture extends CommonInvoice
$displayWarranty = true; $displayWarranty = true;
// Check if this situation invoice is 100% for real // Check if this situation invoice is 100% for real
if(!empty($this->lines)){ if(!empty($this->lines)){
$displayWarranty = true;
foreach( $this->lines as $i => $line ){ foreach( $this->lines as $i => $line ){
if($line->product_type < 2 && $line->situation_percent < 100){ if($line->product_type < 2 && $line->situation_percent < 100){
$displayWarranty = false; $displayWarranty = false;

11
htdocs/compta/facture/list.php
View File

@ -370,7 +370,7 @@ $sql.= ' f.paye as paye, f.fk_statut,';
$sql.= ' f.datec as date_creation, f.tms as date_update,'; $sql.= ' f.datec as date_creation, f.tms as date_update,';
if($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY) if($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY)
{ {
$sql.= ' f.retained_warranty,'; $sql.= ' f.retained_warranty, f.retained_warranty_date_limit, f.situation_final,';
} }
$sql.= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,'; $sql.= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,';
$sql.= " typent.code as typent_code,"; $sql.= " typent.code as typent_code,";
@ -942,7 +942,12 @@ if ($resql)
$facturestatic->date_lim_reglement=$db->jdate($obj->datelimite); $facturestatic->date_lim_reglement=$db->jdate($obj->datelimite);
$facturestatic->note_public=$obj->note_public; $facturestatic->note_public=$obj->note_public;
$facturestatic->note_private=$obj->note_private; $facturestatic->note_private=$obj->note_private;
if($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY)
{
$facturestatic->retained_warranty=$obj->retained_warranty;
$facturestatic->retained_warranty_date_limit=$obj->retained_warranty_date_limit;
$facturestatic->situation_final=$obj->retained_warranty_date_limit;
}
$thirdpartystatic->id=$obj->socid; $thirdpartystatic->id=$obj->socid;
$thirdpartystatic->name=$obj->name; $thirdpartystatic->name=$obj->name;
$thirdpartystatic->client=$obj->client; $thirdpartystatic->client=$obj->client;
@ -1018,7 +1023,7 @@ if ($resql)
print '<td align="center" class="nowrap">'.dol_print_date($datelimit,'day'); print '<td align="center" class="nowrap">'.dol_print_date($datelimit,'day');
if ($facturestatic->hasDelay()) if ($facturestatic->hasDelay())
{ {
print img_warning($langs->trans('Late')); print img_warning($langs->trans('Late'));
} }
print '</td>'; print '</td>';
if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['nbfield']++;