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

New: Ajout icone warning sur facture en retard.

Browse Source
This commit is contained in:
Laurent Destailleur 2005-06-18 14:35:58 +00:00
parent 70ce17832a
commit 382671678a
4 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/compta/facture.php
View File

@ -38,6 +38,10 @@ accessforbidden();
$langs->load("bills");
$warning_delay=31*24*60*60; // Delai affichage warning retard (si retard paiement facture > delai)
require_once "../facture.class.php";
require_once "../paiement.class.php";
if ($conf->projet->enabled) require_once "../project.class.php";
@ -512,7 +516,7 @@ if ($_GET["action"] == 'create')
print '<tr><td>'.$langs->trans("Author").' :</td><td>'.$user->fullname.'</td>';
print '<td rowspan="6" valign="top">';
print '<textarea name="note" wrap="soft" cols="60" rows="5">';
print '<textarea name="note" wrap="soft" cols="50" rows="5">';
if (is_object($commande) && !empty($commande->projet_id))
{
print $commande->note;
@ -526,21 +530,21 @@ if ($_GET["action"] == 'create')
print '<tr><td>'.$langs->trans("Ref").' :</td><td>Provisoire</td></tr>';
print '<input name="facnumber" type="hidden" value="provisoire">';
print "<tr><td>Conditions de réglement :</td><td>";
print "<tr><td nowrap>Conditions de réglement :</td><td>";
$sql = "SELECT rowid, libelle FROM ".MAIN_DB_PREFIX."cond_reglement ORDER BY sortorder";
$result = $db->query($sql);
$conds=array();
if ($result)
{
$num = $db->num_rows();
$num = $db->num_rows($result);
$i = 0;
while ($i < $num)
{
$objp = $db->fetch_object();
$objp = $db->fetch_object($result);
$conds[$objp->rowid]=$objp->libelle;
$i++;
}
$db->free();
$db->free($result);
}
$html->select_array("condid",$conds);
@ -886,7 +890,9 @@ else
print '<tr><td>'.$langs->trans("Date").'</td>';
print "<td colspan=\"3\">".strftime("%A %d %B %Y",$fac->date)."</td>\n";
print "<td>Date limite de réglement : " . strftime("%d %B %Y",$fac->date_lim_reglement) ."</td></tr>";
print "<td>Date limite de réglement : " . strftime("%d %B %Y",$fac->date_lim_reglement);
if ($fac->date_lim_reglement < (time() - $warning_delay)) print img_warning($langs->trans("Late"));
print "</td></tr>";
print '<tr>';
if ($conf->projet->enabled)

25
htdocs/compta/index.php
View File

@ -35,6 +35,8 @@ $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
*/
@ -316,19 +318,15 @@ if ($conf->facture->enabled && $user->rights->facture->lire)
*
*/
$sql = "SELECT f.facnumber, f.rowid, s.nom, s.idp, f.total, f.total_ttc, sum(pf.amount) as am";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f left join ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
$sql .= " WHERE s.idp = f.fk_soc AND f.paye = 0 AND f.fk_statut = 1";
if ($socidp)
{
$sql .= " AND f.fk_soc = $socidp";
}
$sql .= " GROUP BY f.facnumber, f.rowid, s.nom, s.idp, f.total, f.total_ttc";
$sql .= " ORDER BY f.datef ASC ";
$sql = "SELECT f.facnumber, f.rowid, s.nom, s.idp, f.total, f.total_ttc, ".$db->pdate("f.date_lim_reglement")." as datelimite, sum(pf.amount) as am";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f left join ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
$sql.= " WHERE s.idp = f.fk_soc AND f.paye = 0 AND f.fk_statut = 1";
if ($socidp) $sql .= " AND f.fk_soc = $socidp";
$sql.= " GROUP BY f.facnumber, f.rowid, s.nom, s.idp, f.total, f.total_ttc";
$sql.= " ORDER BY f.datef ASC ";
$resql = $db->query($sql);
if ( $resql )
if ($resql)
{
$num = $db->num_rows($resql);
$i = 0;
@ -347,7 +345,10 @@ if ($conf->facture->enabled && $user->rights->facture->lire)
if ($i < $conf->liste_limit)
{
$var=!$var;
print '<tr '.$bc[$var].'><td nowrap><a href="facture.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$obj->facnumber.'</a></td>';
print '<tr '.$bc[$var].'>';
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"));
print '</td>';
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.img_object($langs->trans("ShowCustomer"),"company").' '.dolibarr_trunc($obj->nom,50).'</a></td>';
print '<td align="right">'.price($obj->total).'</td>';
print '<td align="right">'.price($obj->total_ttc).'</td>';

8
htdocs/includes/boxes/box_factures_imp.php
View File

@ -89,14 +89,12 @@ class box_factures_imp extends ModeleBoxes {
$objp = $db->fetch_object($result);
$late="";
if ($obj->datelimite < (time() - $warning_delay))
{
$late=img_warning($langs->trans("Late"));
}
if ($obj->datelimite < (time() - $warning_delay)) $late=img_warning($langs->trans("Late"));
$this->info_box_contents[$i][0] = array('align' => 'left',
'logo' => $this->boximg,
'text' => $objp->facnumber.$late,
'text' => $objp->facnumber,
'text2'=> $late,
'url' => DOL_URL_ROOT."/compta/facture.php?facid=".$objp->facid);
$this->info_box_contents[$i][1] = array('align' => 'left',

9
htdocs/includes/boxes/modules_boxes.php
View File

@ -36,7 +36,7 @@
class ModeleBoxes
{
var $MAXLENGTHBOX=70; // Mettre 0 pour pas de limite
var $MAXLENGTHBOX=20; // Mettre 0 pour pas de limite
var $error='';
@ -88,6 +88,8 @@ class ModeleBoxes
if ($contents[$i][$j]['text']) {
$texte=$contents[$i][$j]['text'];
$textewithnotags=eregi_replace('<[^>]+>','',$texte);
$texte2=$contents[$i][$j]['text2'];
$texte2withnotags=eregi_replace('<[^>]+>','',$texte2);
//print "xxx $textewithnotags y";
if (isset($contents[$i][$j]['logo']) && $contents[$i][$j]['logo']) print '<td width="16">';
@ -104,8 +106,13 @@ class ModeleBoxes
{
$texte=substr($texte,0,$this->MAXLENGTHBOX)."...";
}
if ($this->MAXLENGTHBOX && strlen($texte2withnotags) > $this->MAXLENGTHBOX)
{
$texte2=substr($texte2,0,$this->MAXLENGTHBOX)."...";
}
print $texte;
if ($contents[$i][$j]['url']) print '</a>';
print $texte2;
print "</td>";
}