diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 932c3da1386..22f79d8a282 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -302,7 +302,7 @@ if ($conf->facture->enabled && $user->rights->facture->lire)
$facstatic=new Facture($db);
$sql = "SELECT f.rowid, f.facnumber, f.fk_statut, f.type, f.total, f.total_ttc, f.paye, f.tms,";
- $sql.= $db->pdate("f.date_lim_reglement")." as datelimite,";
+ $sql.= " f.date_lim_reglement as datelimite,";
$sql.= " s.nom, s.rowid as socid,";
$sql.= " sum(pf.amount) as am";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
@@ -348,7 +348,7 @@ if ($conf->facture->enabled && $user->rights->facture->lire)
print $facturestatic->getNomUrl(1,'');
print '';
print '| ';
- if (! $obj->paye && $obj->datelimite < ($now - $conf->facture->client->warning_delay)) print img_warning($langs->trans("Late"));
+ if (! $obj->paye && $db->jdate($obj->datelimite) < ($now - $conf->facture->client->warning_delay)) print img_warning($langs->trans("Late"));
print ' | ';
print '';
$filename=dol_sanitizeFileName($obj->facnumber);
@@ -758,7 +758,7 @@ if ($conf->facture->enabled && $user->rights->facture->lire)
$facstatic=new Facture($db);
$sql = "SELECT f.rowid, f.facnumber, f.fk_statut, f.datef, f.type, f.total, f.total_ttc, f.paye, f.tms,";
- $sql.= $db->pdate("f.date_lim_reglement")." as datelimite,";
+ $sql.= " f.date_lim_reglement as datelimite,";
$sql.= " s.nom, s.rowid as socid,";
$sql.= " sum(pf.amount) as am";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
@@ -803,7 +803,7 @@ if ($conf->facture->enabled && $user->rights->facture->lire)
print $facturestatic->getNomUrl(1,'');
print ' | ';
print '';
- if ($obj->datelimite < ($now - $conf->facture->client->warning_delay)) print img_warning($langs->trans("Late"));
+ if ($db->jdate($obj->datelimite) < ($now - $conf->facture->client->warning_delay)) print img_warning($langs->trans("Late"));
print ' | ';
print '';
$filename=dol_sanitizeFileName($obj->facnumber);
diff --git a/htdocs/includes/boxes/box_factures_imp.php b/htdocs/includes/boxes/box_factures_imp.php
index ba7389420e8..2a18eda2a35 100644
--- a/htdocs/includes/boxes/box_factures_imp.php
+++ b/htdocs/includes/boxes/box_factures_imp.php
@@ -19,11 +19,11 @@
*/
/**
- \file htdocs/includes/boxes/box_factures_imp.php
- \ingroup factures
- \brief Module de generation de l'affichage de la box factures impayees
- \version $Id$
-*/
+ \file htdocs/includes/boxes/box_factures_imp.php
+ \ingroup factures
+ \brief Module de generation de l'affichage de la box factures impayees
+ \version $Id$
+ */
require_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
require_once(DOL_DOCUMENT_ROOT.'/facture.class.php');
@@ -31,84 +31,84 @@ require_once(DOL_DOCUMENT_ROOT.'/facture.class.php');
class box_factures_imp extends ModeleBoxes {
- var $boxcode="oldestunpaidcustomerbills";
- var $boximg="object_bill";
- var $boxlabel;
- var $depends = array("facture");
+ var $boxcode="oldestunpaidcustomerbills";
+ var $boximg="object_bill";
+ var $boxlabel;
+ var $depends = array("facture");
- var $db;
- var $param;
+ var $db;
+ var $param;
- var $info_box_head = array();
- var $info_box_contents = array();
+ var $info_box_head = array();
+ var $info_box_contents = array();
- /**
- * \brief Constructeur de la classe
- */
- function box_factures_imp()
- {
- global $langs;
- $langs->load("boxes");
+ /**
+ * \brief Constructeur de la classe
+ */
+ function box_factures_imp()
+ {
+ global $langs;
+ $langs->load("boxes");
- $this->boxlabel=$langs->trans("BoxOldestUnpaidCustomerBills");
- }
+ $this->boxlabel=$langs->trans("BoxOldestUnpaidCustomerBills");
+ }
- /**
- * \brief Charge les donnees en memoire pour affichage ulterieur
- * \param $max Nombre maximum d'enregistrements a charger
- */
- function loadBox($max=5)
- {
- global $conf, $user, $langs, $db;
+ /**
+ * \brief Charge les donnees en memoire pour affichage ulterieur
+ * \param $max Nombre maximum d'enregistrements a charger
+ */
+ function loadBox($max=5)
+ {
+ global $conf, $user, $langs, $db;
- $this->max=$max;
+ $this->max=$max;
- include_once(DOL_DOCUMENT_ROOT."/facture.class.php");
- $facturestatic=new Facture($db);
+ include_once(DOL_DOCUMENT_ROOT."/facture.class.php");
+ $facturestatic=new Facture($db);
- $this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidCustomerBills",$max));
+ $this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidCustomerBills",$max));
- if ($user->rights->facture->lire)
- {
- $sql = "SELECT s.nom, s.rowid as socid,";
- $sql.= " f.facnumber, f.date_lim_reglement as datelimite,";
- $sql.= " f.amount, f.datef as df,";
- $sql.= " f.paye, f.fk_statut, f.rowid as facid";
- $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql.= " WHERE f.fk_soc = s.rowid";
- $sql.= " AND s.entity = ".$conf->entity;
- $sql.= " AND f.paye = 0";
- $sql.= " AND fk_statut = 1";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
- if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
- //$sql.= " ORDER BY f.datef DESC, f.facnumber DESC ";
- $sql.= " ORDER BY datelimite ASC, f.facnumber ASC ";
- $sql.= $db->plimit($max, 0);
+ if ($user->rights->facture->lire)
+ {
+ $sql = "SELECT s.nom, s.rowid as socid,";
+ $sql.= " f.facnumber, f.date_lim_reglement as datelimite,";
+ $sql.= " f.amount, f.datef as df,";
+ $sql.= " f.paye, f.fk_statut, f.rowid as facid";
+ $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+ if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql.= " WHERE f.fk_soc = s.rowid";
+ $sql.= " AND s.entity = ".$conf->entity;
+ $sql.= " AND f.paye = 0";
+ $sql.= " AND fk_statut = 1";
+ if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+ //$sql.= " ORDER BY f.datef DESC, f.facnumber DESC ";
+ $sql.= " ORDER BY datelimite ASC, f.facnumber ASC ";
+ $sql.= $db->plimit($max, 0);
- $result = $db->query($sql);
- if ($result)
- {
- $num = $db->num_rows($result);
- $now=gmmktime();
+ $result = $db->query($sql);
+ if ($result)
+ {
+ $num = $db->num_rows($result);
+ $now=gmmktime();
- $i = 0;
- $l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateEcheance')).': %s)';
+ $i = 0;
+ $l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateEcheance')).': %s)';
- while ($i < $num)
- {
- $objp = $db->fetch_object($result);
- $datelimite=$db->jdate($objp->datelimite);
+ while ($i < $num)
+ {
+ $objp = $db->fetch_object($result);
+ $datelimite=$db->jdate($objp->datelimite);
- $late='';
- if ($datelimite < ($now - $conf->facture->warning_delay)) $late = img_warning(sprintf($l_due_date,dol_print_date($datelimite,'day')));
+ $late='';
+ if ($datelimite < ($now - $conf->facture->warning_delay)) $late = img_warning(sprintf($l_due_date,dol_print_date($datelimite,'day')));
- $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
+ $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
'logo' => $this->boximg,
'url' => DOL_URL_ROOT."/compta/facture.php?facid=".$objp->facid);
- $this->info_box_contents[$i][1] = array('td' => 'align="left"',
+ $this->info_box_contents[$i][1] = array('td' => 'align="left"',
'text' => $objp->facnumber,
'text2'=> $late,
'url' => DOL_URL_ROOT."/compta/facture.php?facid=".$objp->facid);
@@ -122,35 +122,35 @@ class box_factures_imp extends ModeleBoxes {
'maxlength'=>44,
'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
- $this->info_box_contents[$i][4] = array('td' => 'align="right"',
+ $this->info_box_contents[$i][4] = array('td' => 'align="right"',
'text' => dol_print_date($datelimite,'day'),
- );
+ );
- $this->info_box_contents[$i][5] = array('td' => 'align="right" width="18"',
+ $this->info_box_contents[$i][5] = array('td' => 'align="right" width="18"',
'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3));
- $i++;
- }
+ $i++;
+ }
- if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoUnpaidCustomerBills"));
- }
- else
- {
- $this->info_box_contents[0][0] = array( 'td' => 'align="left"',
+ if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoUnpaidCustomerBills"));
+ }
+ else
+ {
+ $this->info_box_contents[0][0] = array( 'td' => 'align="left"',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
- }
- }
- else {
- $this->info_box_contents[0][0] = array('td' => 'align="left"',
+ }
+ }
+ else {
+ $this->info_box_contents[0][0] = array('td' => 'align="left"',
'text' => $langs->trans("ReadPermissionNotAllowed"));
- }
- }
+ }
+ }
- function showBox()
- {
- parent::showBox($this->info_box_head, $this->info_box_contents);
- }
+ function showBox()
+ {
+ parent::showBox($this->info_box_head, $this->info_box_contents);
+ }
}
|