From 5ad8e3dd95c407e8045b17518fc31e40175d8aa1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 7 Aug 2009 17:54:28 +0000 Subject: [PATCH] Fix: Status not complete --- htdocs/includes/boxes/box_factures_fourn.php | 151 +++++++------- .../includes/boxes/box_factures_fourn_imp.php | 193 +++++++++--------- 2 files changed, 175 insertions(+), 169 deletions(-) diff --git a/htdocs/includes/boxes/box_factures_fourn.php b/htdocs/includes/boxes/box_factures_fourn.php index 6ec62499fb7..042608a6221 100644 --- a/htdocs/includes/boxes/box_factures_fourn.php +++ b/htdocs/includes/boxes/box_factures_fourn.php @@ -30,119 +30,122 @@ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); class box_factures_fourn extends ModeleBoxes { - var $boxcode="lastsupplierbills"; - var $boximg="object_bill"; - var $boxlabel; - var $depends = array("facture","fournisseur"); + var $boxcode="lastsupplierbills"; + var $boximg="object_bill"; + var $boxlabel; + var $depends = array("facture","fournisseur"); 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_fourn() - { - global $langs; - $langs->load("boxes"); + /** + * \brief Constructeur de la classe + */ + function box_factures_fourn() + { + global $langs; + $langs->load("boxes"); - $this->boxlabel=$langs->trans("BoxLastSupplierBills"); - } + $this->boxlabel=$langs->trans("BoxLastSupplierBills"); + } - /** - * \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; include_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php"); - $facturestatic=new FactureFournisseur($db); + $facturestatic=new FactureFournisseur($db); - $this->info_box_head = array( + $this->info_box_head = array( 'text' => $langs->trans("BoxTitleLastSupplierBills",$max) - ); + ); - if ($user->rights->fournisseur->facture->lire) - { - $sql = "SELECT s.nom, s.rowid as socid,"; - $sql.= " f.rowid as facid, f.facnumber, f.amount,"; - $sql.= " f.paye, f.fk_statut,"; - $sql.= ' f.datef as df,'; - $sql.= ' f.datec as datec,'; - $sql.= ' f.date_lim_reglement as datelimite, f.tms'; - $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; - $sql.= ", ".MAIN_DB_PREFIX."facture_fourn 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; - 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.tms DESC"; - $sql.= $db->plimit($max, 0); + if ($user->rights->fournisseur->facture->lire) + { + $sql = "SELECT s.nom, s.rowid as socid,"; + $sql.= " f.rowid as facid, f.facnumber, f.amount,"; + $sql.= " f.paye, f.fk_statut,"; + $sql.= ' f.datef as df,'; + $sql.= ' f.datec as datec,'; + $sql.= ' f.date_lim_reglement as datelimite, f.tms, f.type'; + $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; + $sql.= ", ".MAIN_DB_PREFIX."facture_fourn 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; + 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.tms DESC"; + $sql.= $db->plimit($max, 0); - $result = $db->query($sql); - if ($result) - { - $num = $db->num_rows($result); + $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); + while ($i < $num) + { + $objp = $db->fetch_object($result); $datelimite=$db->jdate($objp->datelimite); $datec=$db->jdate($objp->datec); - $late = ''; - if ($objp->paye == 0 && $datelimite < ($now - $conf->facture->fournisseur->warning_delay)) $late=img_warning(sprintf($l_due_date, dol_print_date($datelimite,'day'))); + $late = ''; + if ($objp->paye == 0 && $datelimite < ($now - $conf->facture->fournisseur->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."/fourn/facture/fiche.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."/fourn/facture/fiche.php?facid=".$objp->facid); - $this->info_box_contents[$i][2] = array('td' => 'align="left"', + $this->info_box_contents[$i][2] = array('td' => 'align="left"', 'text' => $objp->nom, 'url' => DOL_URL_ROOT."/fourn/fiche.php?socid=".$objp->socid); $this->info_box_contents[$i][3] = array('td' => 'align="right"', 'text' => dol_print_date($datec,'day')); - $this->info_box_contents[$i][4] = array('td' => 'align="right" width="18"', - 'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3)); + $fac = new FactureFournisseur($db); + $fac->fetch($objp->facid); + $alreadypayed=$fac->getSommePaiement(); + $this->info_box_contents[$i][4] = array('td' => 'align="right" width="18"', + 'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3,$alreadypayed,$objp->type)); - $i++; - } + $i++; + } - if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoUnpayedCustomerBills")); - } - else { - dol_print_error($db); - } - } - 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("NoUnpayedCustomerBills")); + } + else { + dol_print_error($db); + } + } + else { + $this->info_box_contents[0][0] = array('td' => 'align="left"', 'text' => $langs->transnoentities("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); + } } diff --git a/htdocs/includes/boxes/box_factures_fourn_imp.php b/htdocs/includes/boxes/box_factures_fourn_imp.php index 8ae7fe306e0..b0bd3ec5d26 100644 --- a/htdocs/includes/boxes/box_factures_fourn_imp.php +++ b/htdocs/includes/boxes/box_factures_fourn_imp.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -18,131 +18,134 @@ */ /** - \file htdocs/includes/boxes/box_factures_fourn_imp.php - \ingroup fournisseur - \brief Fichier de gestion d'une box des factures fournisseurs impayees - \version $Id$ -*/ + * \file htdocs/includes/boxes/box_factures_fourn_imp.php + * \ingroup fournisseur + * \brief Fichier de gestion d'une box des factures fournisseurs impayees + * \version $Id$ + */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); class box_factures_fourn_imp extends ModeleBoxes { - var $boxcode="oldestunpayedsupplierbills"; - var $boximg="object_bill"; - var $boxlabel; - var $depends = array("facture","fournisseur"); + var $boxcode="oldestunpayedsupplierbills"; + var $boximg="object_bill"; + var $boxlabel; + var $depends = array("facture","fournisseur"); 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_fourn_imp() - { - global $langs; - $langs->load("boxes"); + /** + * \brief Constructeur de la classe + */ + function box_factures_fourn_imp() + { + global $langs; + $langs->load("boxes"); - $this->boxlabel=$langs->trans("BoxOldestUnpayedSupplierBills"); - } + $this->boxlabel=$langs->trans("BoxOldestUnpayedSupplierBills"); + } - /** - * \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; - - include_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php"); - $facturestatic=new FactureFournisseur($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->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpayedSupplierBills",$max)); + $this->max=$max; - if ($user->rights->fournisseur->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"; - $sql.= ",".MAIN_DB_PREFIX."facture_fourn 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 datelimite DESC, f.facnumber DESC "; - $sql.= $db->plimit($max, 0); - - $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)'; - - while ($i < $num) - { - $objp = $db->fetch_object($result); - $datelimite=$db->jdate($objp->datelimite); - - $late=''; - if ($datelimite < ($now - $conf->facture->fournisseur->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"', + include_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php"); + $facturestatic=new FactureFournisseur($db); + + $this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpayedSupplierBills",$max)); + + if ($user->rights->fournisseur->facture->lire) + { + $sql = "SELECT s.nom, s.rowid as socid,"; + $sql.= " f.rowid as facid, f.facnumber, f.date_lim_reglement as datelimite,"; + $sql.= " f.amount, f.datef as df,"; + $sql.= " f.paye, f.fk_statut, f.type"; + $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; + $sql.= ",".MAIN_DB_PREFIX."facture_fourn 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 datelimite DESC, f.facnumber DESC "; + $sql.= $db->plimit($max, 0); + + $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)'; + + while ($i < $num) + { + $objp = $db->fetch_object($result); + $datelimite=$db->jdate($objp->datelimite); + + $late=''; + if ($datelimite < ($now - $conf->facture->fournisseur->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"', 'logo' => $this->boximg, 'url' => DOL_URL_ROOT."/fourn/facture/fiche.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."/fourn/facture/fiche.php?facid=".$objp->facid); - $this->info_box_contents[$i][2] = array('td' => 'align="left"', + $this->info_box_contents[$i][2] = array('td' => 'align="left"', 'text' => $objp->nom, 'url' => DOL_URL_ROOT."/fourn/fiche.php?socid=".$objp->socid); - - $this->info_box_contents[$i][3] = array('td' => 'align="right"', + + $this->info_box_contents[$i][3] = array('td' => 'align="right"', 'text' => dol_print_date($datelimite,'day')); - $this->info_box_contents[$i][4] = array('td' => 'align="right" width="18"', - 'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3)); - - $i++; - } - - if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoUnpayedSupplierBills")); - } - else { - $this->info_box_contents[0][0] = array( 'td' => 'align="left"', + $fac = new FactureFournisseur($db); + $fac->fetch($objp->facid); + $alreadypayed=$fac->getSommePaiement(); + $this->info_box_contents[$i][4] = array('td' => 'align="right" width="18"', + 'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3,$alreadypayed,$objp->type)); + + $i++; + } + + if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoUnpayedSupplierBills")); + } + 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); + } }