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

Qual: Ne charge la classe Notify que si besoin

Browse Source
This commit is contained in:
Laurent Destailleur 2005-06-25 22:46:19 +00:00
parent f477365b48
commit 8be79ef68a
3 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/compta/facture.php
View File

@ -1572,10 +1572,7 @@ else
$fac=new Facture($db); $fac=new Facture($db);
if ($page == -1) if ($page == -1) $page = 0 ;
{
$page = 0 ;
}
if ($user->rights->facture->lire) if ($user->rights->facture->lire)
{ {
@ -1585,7 +1582,9 @@ else
if (! $sortorder) $sortorder="DESC"; if (! $sortorder) $sortorder="DESC";
if (! $sortfield) $sortfield="f.datef"; if (! $sortfield) $sortfield="f.datef";
$sql = "SELECT s.nom,s.idp,f.facnumber,f.increment,f.total,f.total_ttc,".$db->pdate("f.datef")." as df, f.paye as paye, f.rowid as facid, f.fk_statut, sum(pf.amount) as am"; $sql = "SELECT s.nom,s.idp,f.facnumber,f.increment,f.total,f.total_ttc,";
$sql.= $db->pdate("f.datef")." as df, ".$db->pdate("f.date_lim_reglement")." as datelimite, ";
$sql.= " f.paye as paye, f.rowid as facid, f.fk_statut, sum(pf.amount) as am";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ",".MAIN_DB_PREFIX."facture as f"; $sql.= ",".MAIN_DB_PREFIX."facture as f";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture "; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture ";
@ -1715,7 +1714,9 @@ else
} }
print '<td><a href="facture.php?facid='.$objp->facid.'">'.img_object($langs->trans("ShowBill"),"bill").'</a> '; print '<td><a href="facture.php?facid='.$objp->facid.'">'.img_object($langs->trans("ShowBill"),"bill").'</a> ';
print '<a href="facture.php?facid='.$objp->facid.'">'.$objp->facnumber.'</a>'.$objp->increment."</td>\n"; print '<a href="facture.php?facid='.$objp->facid.'">'.$objp->facnumber.'</a>'.$objp->increment;
if ($objp->datelimite < (time() - $warning_delay) && ! $objp->paye && $objp->fk_statut == 1 && ! $objp->am) print img_warning($langs->trans("Late"));
print "</td>\n";
if ($objp->df > 0 ) if ($objp->df > 0 )
{ {

4
htdocs/fichinter/fichinter.class.php
View File

@ -234,10 +234,10 @@ class Fichinter
/* /*
* Notify * Notify
*
*/ */
$mesg = "La fiche d'intervention ".$this->ref." a été validée.\n"; $mesg = "La fiche d'intervention ".$this->ref." a été validée.\n";
require_once(DOL_DOCUMENT_ROOT ."/notify.class.php");
$notify = New Notify($this->db); $notify = New Notify($this->db);
$notify->send($action_notify, $this->societe_id, $mesg, "ficheinter", $this->id, $filepdf); $notify->send($action_notify, $this->societe_id, $mesg, "ficheinter", $this->id, $filepdf);
@ -246,13 +246,13 @@ class Fichinter
else else
{ {
print $this->db->error() . ' in ' . $sql; print $this->db->error() . ' in ' . $sql;
return -1;
} }
} }
/* /*
* \brief Charge la liste des clients depuis la base * \brief Charge la liste des clients depuis la base
*
*/ */
function fetch_client() function fetch_client()
{ {

1
htdocs/master.inc.php
View File

@ -106,7 +106,6 @@ require_once(DOL_DOCUMENT_ROOT ."/user.class.php");
require_once(DOL_DOCUMENT_ROOT ."/lib/functions.inc.php"); require_once(DOL_DOCUMENT_ROOT ."/lib/functions.inc.php");
require_once(DOL_DOCUMENT_ROOT ."/html.form.class.php"); require_once(DOL_DOCUMENT_ROOT ."/html.form.class.php");
require_once(DOL_DOCUMENT_ROOT ."/menu.class.php"); require_once(DOL_DOCUMENT_ROOT ."/menu.class.php");
require_once(DOL_DOCUMENT_ROOT ."/notify.class.php");
require_once(DOL_DOCUMENT_ROOT ."/address.class.php"); require_once(DOL_DOCUMENT_ROOT ."/address.class.php");