From 736dca48c50d4a040d97b3fe829068c901205074 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 1 Nov 2006 15:39:40 +0000 Subject: [PATCH] =?UTF-8?q?Ajout=20date=20cr=E9ation=20sur=20boite=20derni?= =?UTF-8?q?er=20client,=20fournisseurs,=20prospect=20enregsitr=E9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/includes/boxes/box_clients.php | 24 +++++++++++++++++-- htdocs/includes/boxes/box_fournisseurs.php | 28 ++++++++++++++++++---- htdocs/includes/boxes/box_prospect.php | 11 ++++++--- 3 files changed, 54 insertions(+), 9 deletions(-) diff --git a/htdocs/includes/boxes/box_clients.php b/htdocs/includes/boxes/box_clients.php index df82bf4c665..89ae8d9e76c 100644 --- a/htdocs/includes/boxes/box_clients.php +++ b/htdocs/includes/boxes/box_clients.php @@ -66,7 +66,7 @@ class box_clients extends ModeleBoxes { if ($user->rights->societe->lire) { - $sql = "SELECT s.nom,s.idp"; + $sql = "SELECT s.nom, s.idp, ".$db->pdate("s.datec")." as dc"; if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -86,7 +86,7 @@ class box_clients extends ModeleBoxes { $num = $db->num_rows($result); $i = 0; - + //$customerstatic=new Client($db); while ($i < $num) { $objp = $db->fetch_object($result); @@ -96,8 +96,28 @@ class box_clients extends ModeleBoxes { 'text' => stripslashes($objp->nom), 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->idp); + $this->info_box_contents[$i][1] = array('align' => 'right', + 'text' => dolibarr_print_date($objp->dc, "day")); + $i++; } + + $i=$num; + while ($i < $max) + { + if ($num==0 && $i==$num) + { + $this->info_box_contents[$i][0] = array('align' => 'center','text'=>$langs->trans("NoRecordedCustomers")); + $this->info_box_contents[$i][1] = array('text'=>' '); + $this->info_box_contents[$i][2] = array('text'=>' '); + } else { + $this->info_box_contents[$i][0] = array('text'=>' '); + $this->info_box_contents[$i][1] = array('text'=>' '); + $this->info_box_contents[$i][2] = array('text'=>' '); + } + $i++; + } + } else { dolibarr_print_error($db); diff --git a/htdocs/includes/boxes/box_fournisseurs.php b/htdocs/includes/boxes/box_fournisseurs.php index c06896749bc..db51080f187 100644 --- a/htdocs/includes/boxes/box_fournisseurs.php +++ b/htdocs/includes/boxes/box_fournisseurs.php @@ -66,7 +66,7 @@ class box_fournisseurs extends ModeleBoxes { if ($user->rights->societe->lire) { - $sql = "SELECT s.nom,s.idp"; + $sql = "SELECT s.nom, s.idp, ".$db->pdate("s.datec")." as dc"; if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -83,10 +83,10 @@ class box_fournisseurs extends ModeleBoxes { if ($result) { - $num = $db->num_rows(); + $num = $db->num_rows($result); $i = 0; - + //$supplierstatic=new Fournisseur($db); while ($i < $num) { $objp = $db->fetch_object($result); @@ -95,9 +95,29 @@ class box_fournisseurs extends ModeleBoxes { 'logo' => $this->boximg, 'text' => $objp->nom, 'url' => DOL_URL_ROOT."/fourn/fiche.php?socid=".$objp->idp); - + + $this->info_box_contents[$i][1] = array('align' => 'right', + 'text' => dolibarr_print_date($objp->dc, "day")); + $i++; } + + $i=$num; + while ($i < $max) + { + if ($num==0 && $i==$num) + { + $this->info_box_contents[$i][0] = array('align' => 'center','text'=>$langs->trans("NoRecordedSuppliers")); + $this->info_box_contents[$i][1] = array('text'=>' '); + $this->info_box_contents[$i][2] = array('text'=>' '); + } else { + $this->info_box_contents[$i][0] = array('text'=>' '); + $this->info_box_contents[$i][1] = array('text'=>' '); + $this->info_box_contents[$i][2] = array('text'=>' '); + } + $i++; + } + } else { dolibarr_print_error($db); diff --git a/htdocs/includes/boxes/box_prospect.php b/htdocs/includes/boxes/box_prospect.php index 24f22de1bda..53996c0d832 100644 --- a/htdocs/includes/boxes/box_prospect.php +++ b/htdocs/includes/boxes/box_prospect.php @@ -69,7 +69,7 @@ class box_prospect extends ModeleBoxes { if ($user->rights->societe->lire) { - $sql = "SELECT s.nom, s.idp, s.fk_stcomm"; + $sql = "SELECT s.nom, s.idp, s.fk_stcomm, ".$db->pdate("s.datec")." as dc"; if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= ", sc.fk_soc, sc.fk_user"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -99,9 +99,12 @@ class box_prospect extends ModeleBoxes { 'text' => stripslashes($objp->nom), 'url' => DOL_URL_ROOT."/comm/prospect/fiche.php?id=".$objp->idp); - $this->info_box_contents[$i][1] = array('align' => 'right', + $this->info_box_contents[$i][1] = array('align' => 'ce,ter', + 'text' => dolibarr_print_date($objp->dc, "day")); + + $this->info_box_contents[$i][2] = array('align' => 'right', 'text' => $prospectstatic->LibStatut($objp->fk_stcomm,3)); - + $i++; } @@ -113,10 +116,12 @@ class box_prospect extends ModeleBoxes { $this->info_box_contents[$i][0] = array('align' => 'center','text'=>$langs->trans("NoRecordedProspects")); $this->info_box_contents[$i][1] = array('text'=>' '); $this->info_box_contents[$i][2] = array('text'=>' '); + $this->info_box_contents[$i][3] = array('text'=>' '); } else { $this->info_box_contents[$i][0] = array('text'=>' '); $this->info_box_contents[$i][1] = array('text'=>' '); $this->info_box_contents[$i][2] = array('text'=>' '); + $this->info_box_contents[$i][3] = array('text'=>' '); } $i++; }