From 4b9e1808325f29f7a4d78b30c5f7dda6c32a64c1 Mon Sep 17 00:00:00 2001 From: ywarnier Date: Fri, 30 May 2008 07:06:36 +0000 Subject: [PATCH] Improved invoices boxes by adding due date on warning icon hovering --- htdocs/includes/boxes/box_factures.php | 10 ++++++++-- htdocs/includes/boxes/box_factures_fourn.php | 7 ++++++- htdocs/includes/boxes/box_factures_fourn_imp.php | 9 +++++---- htdocs/includes/boxes/box_factures_imp.php | 5 +++-- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/htdocs/includes/boxes/box_factures.php b/htdocs/includes/boxes/box_factures.php index 7de9b653572..32d3ffe363c 100644 --- a/htdocs/includes/boxes/box_factures.php +++ b/htdocs/includes/boxes/box_factures.php @@ -65,8 +65,9 @@ class box_factures extends ModeleBoxes { include_once(DOL_DOCUMENT_ROOT."/facture.class.php"); $facturestatic=new Facture($db); + $text = $langs->trans("BoxTitleLastCustomerBills",$max); $this->info_box_head = array( - 'text' => $langs->trans("BoxTitleLastCustomerBills",$max), + 'text' => $text, 'limit'=> strlen($text) ); @@ -74,7 +75,8 @@ class box_factures extends ModeleBoxes { { $sql = "SELECT f.rowid as facid, f.facnumber, f.type, f.amount, ".$db->pdate("f.datef")." as df,"; $sql.= " f.paye, f.fk_statut, f.datec,"; - $sql.= " s.nom, s.rowid as socid"; + $sql.= " s.nom, s.rowid as socid, "; + $sql.= $db->pdate('f.date_lim_reglement')." as datelimite "; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user"; $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"; @@ -94,6 +96,7 @@ class box_factures extends ModeleBoxes { $num = $db->num_rows(); $i = 0; + $l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateEcheance')).': %s)'; while ($i < $num) { @@ -102,10 +105,13 @@ class box_factures extends ModeleBoxes { $picto='bill'; if ($objp->type == 1) $picto.='r'; if ($objp->type == 2) $picto.='a'; + $late = ''; + if($objp->paye == 0 && $objp->datelimite < (time() - $conf->facture->warning_delay)) { $late = img_warning(sprintf($l_due_date,dolibarr_print_date($objp->datelimite,'day')));} $this->info_box_contents[$i][0] = array('align' => 'left', 'logo' => $picto, 'text' => $objp->facnumber, + 'text2'=> $late, 'url' => DOL_URL_ROOT."/compta/facture.php?facid=".$objp->facid); $this->info_box_contents[$i][1] = array('align' => 'left', diff --git a/htdocs/includes/boxes/box_factures_fourn.php b/htdocs/includes/boxes/box_factures_fourn.php index 3e966acd79e..f55c0a8c6ed 100644 --- a/htdocs/includes/boxes/box_factures_fourn.php +++ b/htdocs/includes/boxes/box_factures_fourn.php @@ -73,7 +73,8 @@ class box_factures_fourn extends ModeleBoxes { { $sql = "SELECT s.nom, s.rowid as socid,"; $sql.= " f.rowid as facid, f.facnumber, f.amount,".$db->pdate("f.datef")." as df,"; - $sql.= " f.paye, f.fk_statut, f.datec"; + $sql.= " f.paye, f.fk_statut, f.datec,"; + $sql.= ' '.$db->pdate('f.date_lim_reglement').' as datelimite '; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_fourn as f"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -93,14 +94,18 @@ class box_factures_fourn extends ModeleBoxes { $num = $db->num_rows($result); $i = 0; + $l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateEcheance')).': %s)'; while ($i < $num) { $objp = $db->fetch_object($result); + $late = ''; + if ($objp->paye == 0 && $objp->datelimite < (time() - $conf->facture->fournisseur->warning_delay)) $late=img_warning(sprintf($l_due_date, dolibarr_print_date($objp->datelimite,'day'))); $this->info_box_contents[$i][0] = array('align' => 'left', 'logo' => $this->boximg, 'text' => $objp->facnumber, + 'text2'=> $late, 'url' => DOL_URL_ROOT."/fourn/facture/fiche.php?facid=".$objp->facid); $this->info_box_contents[$i][1] = array('align' => 'left', diff --git a/htdocs/includes/boxes/box_factures_fourn_imp.php b/htdocs/includes/boxes/box_factures_fourn_imp.php index 6901d0202bc..ab09504689c 100644 --- a/htdocs/includes/boxes/box_factures_fourn_imp.php +++ b/htdocs/includes/boxes/box_factures_fourn_imp.php @@ -92,14 +92,15 @@ class box_factures_fourn_imp extends ModeleBoxes { $num = $db->num_rows(); $i = 0; - + $l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateEcheance')).': %s)'; + while ($i < $num) { $objp = $db->fetch_object($result); - $late=""; - if ($objp->datelimite < (time() - $conf->facture->fournisseur->warning_delay)) $late=img_warning($langs->trans("Late")); - + $late=''; + if ($objp->datelimite < (time() - $conf->facture->fournisseur->warning_delay)) $late=img_warning(sprintf($l_due_date,dolibarr_print_date($objp->datelimite,'day'))); + $this->info_box_contents[$i][0] = array('align' => 'left', 'logo' => $this->boximg, 'text' => $objp->facnumber, diff --git a/htdocs/includes/boxes/box_factures_imp.php b/htdocs/includes/boxes/box_factures_imp.php index 2d827de0fb4..0ed213e858e 100644 --- a/htdocs/includes/boxes/box_factures_imp.php +++ b/htdocs/includes/boxes/box_factures_imp.php @@ -93,13 +93,14 @@ class box_factures_imp extends ModeleBoxes { $num = $db->num_rows($result); $i = 0; + $l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateEcheance')).': %s)'; while ($i < $num) { $objp = $db->fetch_object($result); - $late=""; - if ($objp->datelimite < (time() - $conf->facture->warning_delay)) $late=img_warning($langs->trans("Late")); + $late=''; + if ($objp->datelimite < (time() - $conf->facture->warning_delay)) $late = img_warning(sprintf($l_due_date,dolibarr_print_date($objp->datelimite,'day'))); $this->info_box_contents[$i][0] = array('align' => 'left', 'logo' => $this->boximg,