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

New: Affiche picto retard sur les propales

Browse Source
This commit is contained in:
Laurent Destailleur 2005-08-13 14:22:16 +00:00
parent d92540086e
commit fe663a3482
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/comm/index.php
View File

@ -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) 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); $obj = $db->fetch_object($result);
$var=!$var; $var=!$var;
print "<tr $bc[$var]><td width=\"15%\" nowrap><a href=\"propal.php?propalid=".$obj->propalid."\">".img_object($langs->trans("ShowPropal"),"propal")." ".$obj->ref."</a></td>"; print "<tr $bc[$var]><td width=\"15%\" nowrap><a href=\"propal.php?propalid=".$obj->propalid."\">".img_object($langs->trans("ShowPropal"),"propal")." ".$obj->ref."</a>";
if ($obj->dp < (time() - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
print "</td>";
print "<td><a href=\"fiche.php?socid=$obj->idp\">".img_object($langs->trans("ShowCompany"),"company")." ".dolibarr_trunc($obj->nom,44)."</a></td>\n"; print "<td><a href=\"fiche.php?socid=$obj->idp\">".img_object($langs->trans("ShowCompany"),"company")." ".dolibarr_trunc($obj->nom,44)."</a></td>\n";
print "<td align=\"right\">"; print "<td align=\"right\">";
print dolibarr_print_date($obj->dp)."</td>\n"; print dolibarr_print_date($obj->dp)."</td>\n";

9
htdocs/comm/propal.php
View File

@ -460,13 +460,14 @@ if ($_GET['propalid'])
print '</tr>'; print '</tr>';
print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3">'; print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3">';
print dolibarr_print_date($propal->date,'%a %e %B %Y'); print dolibarr_print_date($propal->date,'%a %d %B %Y');
print '</td>'; print '</td>';
print '<td>'.$langs->trans('DateEndPropal').'</td><td>'; print '<td>'.$langs->trans('DateEndPropal').'</td><td>';
if ($propal->fin_validite) 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 { else {
print $langs->trans("Unknown"); print $langs->trans("Unknown");
@ -1169,7 +1170,9 @@ else
// Date fin validite // Date fin validite
if ( $now > $objp->dfv && $objp->dfv > 0 ) if ( $now > $objp->dfv && $objp->dfv > 0 )
{ {
print '<td align="center">'.dolibarr_print_date($objp->dfv).'</td>'; print '<td align="center">'.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 '</td>';
} }
else else
{ {

4
htdocs/compta/index.php
View File

@ -35,8 +35,6 @@ $user->getrights(); // On a besoin des permissions sur plusieurs modules
$langs->load("compta"); $langs->load("compta");
$langs->load("bills"); $langs->load("bills");
$warning_delay=31*24*60*60; // Delai affichage warning retard (si retard paiement facture > delai)
// Sécurité accés client // Sécurité accés client
$socidp=''; $socidp='';
if ($user->societe_id > 0) if ($user->societe_id > 0)
@ -361,7 +359,7 @@ if ($conf->facture->enabled && $user->rights->facture->lire)
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
print '<td nowrap><a href="facture.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$obj->facnumber.'</a>'; print '<td nowrap><a href="facture.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$obj->facnumber.'</a>';
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 '</td>'; print '</td>';
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.img_object($langs->trans("ShowCustomer"),"company").' '.dolibarr_trunc($obj->nom,44).'</a></td>'; print '<td><a href="fiche.php?socid='.$obj->idp.'">'.img_object($langs->trans("ShowCustomer"),"company").' '.dolibarr_trunc($obj->nom,44).'</a></td>';
print '<td align="right">'.price($obj->total).'</td>'; print '<td align="right">'.price($obj->total).'</td>';

7
htdocs/compta/propal.php
View File

@ -159,13 +159,14 @@ if ($_GET["propalid"])
print '</tr>'; print '</tr>';
print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3">'; print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3">';
print dolibarr_print_date($propal->date); print dolibarr_print_date($propal->date,'%a %d %B %Y');
print '</td>'; print '</td>';
print '<td>'.$langs->trans('DateEndPropal').'</td><td>'; print '<td>'.$langs->trans('DateEndPropal').'</td><td>';
if ($propal->fin_validite) 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 else
{ {
@ -284,6 +285,8 @@ if ($_GET["propalid"])
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print '<tr><td height="10">'.$langs->trans('AmountTTC').'</td><td align="right" colspan="2">'.price($propal->total_ttc).'</td>'; print '<tr><td height="10">'.$langs->trans('AmountTTC').'</td><td align="right" colspan="2">'.price($propal->total_ttc).'</td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
// Statut
print '<tr><td height="10">'.$langs->trans('Status').'</td><td align="left" colspan="3">'.$propal->getLibStatut().'</td></tr>'; print '<tr><td height="10">'.$langs->trans('Status').'</td><td align="left" colspan="3">'.$propal->getLibStatut().'</td></tr>';
print '</table><br>'; print '</table><br>';
if ($propal->brouillon == 1 && $user->rights->propale->creer) if ($propal->brouillon == 1 && $user->rights->propale->creer)