diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index a7e1348d305..0a18ca33f43 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -454,7 +454,7 @@ if ($conf->contrat->enabled && 0) // \todo A REFAIRE DEPUIS NOUVEAU CONTRAT } /* - * Dernières propales ouvertes + * Propales ouvertes * */ if ($conf->propal->enabled && $user->rights->propale->lire) @@ -481,7 +481,9 @@ if ($conf->propal->enabled && $user->rights->propale->lire) { $obj = $db->fetch_object($result); $var=!$var; - print "propalid."\">".img_object($langs->trans("ShowPropal"),"propal")." ".$obj->ref.""; + print "propalid."\">".img_object($langs->trans("ShowPropal"),"propal")." ".$obj->ref.""; + if ($obj->dp < (time() - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late")); + print ""; print "idp\">".img_object($langs->trans("ShowCompany"),"company")." ".dolibarr_trunc($obj->nom,44)."\n"; print ""; print dolibarr_print_date($obj->dp)."\n"; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index aa86de08317..6e61ab9884b 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -460,13 +460,14 @@ if ($_GET['propalid']) print ''; print ''.$langs->trans('Date').''; - print dolibarr_print_date($propal->date,'%a %e %B %Y'); + print dolibarr_print_date($propal->date,'%a %d %B %Y'); print ''; print ''.$langs->trans('DateEndPropal').''; if ($propal->fin_validite) { - print dolibarr_print_date($propal->fin_validite); + print dolibarr_print_date($propal->fin_validite,'%a %d %B %Y'); + if ($propal->statut == 1 && $propal->fin_validite < (time() - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late")); } else { print $langs->trans("Unknown"); @@ -1169,7 +1170,9 @@ else // Date fin validite if ( $now > $objp->dfv && $objp->dfv > 0 ) { - print ''.dolibarr_print_date($objp->dfv).''; + print ''.dolibarr_print_date($objp->dfv); + if ($objp->fk_statut == 1 && $objp->dfv < (time() - $conf->propal->cloture->warning_delay)) print ' '.img_warning($langs->trans("Late")); + print ''; } else { diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 80e71b53c60..ed1f3ce4893 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -35,8 +35,6 @@ $user->getrights(); // On a besoin des permissions sur plusieurs modules $langs->load("compta"); $langs->load("bills"); -$warning_delay=31*24*60*60; // Delai affichage warning retard (si retard paiement facture > delai) - // Sécurité accés client $socidp=''; if ($user->societe_id > 0) @@ -361,7 +359,7 @@ if ($conf->facture->enabled && $user->rights->facture->lire) $var=!$var; print ''; print ''.img_object($langs->trans("ShowBill"),"bill").' '.$obj->facnumber.''; - if ($obj->datelimite < (time() - $warning_delay)) print img_warning($langs->trans("Late")); + if ($obj->datelimite < (time() - $conf->facture->client->warning_delay)) print img_warning($langs->trans("Late")); print ''; print ''.img_object($langs->trans("ShowCustomer"),"company").' '.dolibarr_trunc($obj->nom,44).''; print ''.price($obj->total).''; diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index f0ae5355f90..9b7a07d8f08 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -159,13 +159,14 @@ if ($_GET["propalid"]) print ''; print ''.$langs->trans('Date').''; - print dolibarr_print_date($propal->date); + print dolibarr_print_date($propal->date,'%a %d %B %Y'); print ''; print ''.$langs->trans('DateEndPropal').''; if ($propal->fin_validite) { - print dolibarr_print_date($propal->fin_validite); + print dolibarr_print_date($propal->fin_validite,'%a %d %B %Y'); + if ($propal->statut == 1 && $propal->$propal->fin_validite < (time() - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late")); } else { @@ -284,6 +285,8 @@ if ($_GET["propalid"]) print ''.$langs->trans("Currency".$conf->monnaie).''; print ''.$langs->trans('AmountTTC').''.price($propal->total_ttc).''; print ''.$langs->trans("Currency".$conf->monnaie).''; + + // Statut print ''.$langs->trans('Status').''.$propal->getLibStatut().''; print '
'; if ($propal->brouillon == 1 && $user->rights->propale->creer)