From 0539441bcefb805cd46f3437c956ceec6a4cd77e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 4 Sep 2005 21:42:55 +0000 Subject: [PATCH] New: Ajout des pages de stats commandes et contrats --- htdocs/product/stats/commande.php | 315 ++++++++++++++++++++++++++++++ htdocs/product/stats/contrat.php | 315 ++++++++++++++++++++++++++++++ htdocs/product/stats/facture.php | 46 +++-- htdocs/product/stats/propal.php | 68 ++++--- 4 files changed, 701 insertions(+), 43 deletions(-) create mode 100644 htdocs/product/stats/commande.php create mode 100644 htdocs/product/stats/contrat.php diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php new file mode 100644 index 00000000000..984aa10b85e --- /dev/null +++ b/htdocs/product/stats/commande.php @@ -0,0 +1,315 @@ + + * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2005 Regis Houssin + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ + * $Source$ + */ + +/** + \file htdocs/product/stats/commande.php + \ingroup product, service, commande + \brief Page des stats des commandes pour un produit + \version $Revision$ +*/ + + +require("./pre.inc.php"); +include_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); + +$langs->load("orders"); + +$mesg = ''; + +$page = $_GET["page"]; +$sortfield=$_GET["sortfield"]; +$sortorder=$_GET["sortorder"]; +if ($page == -1) { $page = 0 ; } +$offset = $conf->liste_limit * $_GET["page"] ; +$pageprev = $_GET["page"] - 1; +$pagenext = $_GET["page"] + 1; +if (! $sortorder) $sortorder="DESC"; +if (! $sortfield) $sortfield="c.date_creation"; + + +if ($user->societe_id > 0) +{ + $action = ''; + $socid = $user->societe_id; +} +else +{ + $socid = 0; +} + + +/* + * Affiche fiche + * + */ + +llxHeader(); + + +if ($_GET["id"]) +{ + $product = new Product($db); + $result = $product->fetch($_GET["id"]); + + if ($result > 0) + { + /* + * En mode visu + */ + + $h=0; + + $head[$h][0] = DOL_URL_ROOT."/product/fiche.php?id=".$product->id; + $head[$h][1] = $langs->trans("Card"); + $h++; + + $head[$h][0] = DOL_URL_ROOT."/product/price.php?id=".$product->id; + $head[$h][1] = $langs->trans("Price"); + $h++; + + if($product->type == 0) + { + if ($user->rights->barcode->lire) + { + if ($conf->barcode->enabled) + { + $head[$h][0] = DOL_URL_ROOT."/product/barcode.php?id=".$product->id; + $head[$h][1] = $langs->trans("BarCode"); + $h++; + } + } + } + + + $head[$h][0] = DOL_URL_ROOT."/product/photos.php?id=".$product->id; + $head[$h][1] = $langs->trans("Photos"); + $h++; + + if($product->type == 0) + { + if ($conf->stock->enabled) + { + $head[$h][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$product->id; + $head[$h][1] = $langs->trans("Stock"); + $h++; + } + } + + if ($conf->fournisseur->enabled) + { + $head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$product->id; + $head[$h][1] = $langs->trans("Suppliers"); + $h++; + } + + $head[$h][0] = DOL_URL_ROOT."/product/stats/fiche.php?id=".$product->id; + $head[$h][1] = $langs->trans('Statistics'); + $h++; + + //erics: pour créer des produits composés de x 'sous' produits + $head[$h][0] = DOL_URL_ROOT."/product/pack.php?id=".$product->id; + $head[$h][1] = $langs->trans('Packs'); + $h++; + + $head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?id=".$product->id; + $head[$h][1] = $langs->trans('Referers'); + $hselected=$h; + $h++; + + $head[$h][0] = DOL_URL_ROOT.'/product/document.php?id='.$product->id; + $head[$h][1] = $langs->trans('Documents'); + $h++; + + dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref); + + + print ''; + + print ''; + print ''; + print ''; + print ''; + print ''; + + // Prix + print ''; + + // Statut + print ''; + + print ''; + print ''; + print ''; + print ''; + print ''; + + // Propals + if ($conf->propal->enabled) + { + $ret=$product->load_stats_propale($socid); + if ($ret < 0) dolibarr_print_error($db); + $langs->load("propal"); + print ''; + print ''; + } + // Commandes + if ($conf->commande->enabled) + { + $ret=$product->load_stats_commande($socid); + if ($ret < 0) dolibarr_print_error($db); + $langs->load("orders"); + print ''; + print ''; + } + // Contrats + if ($conf->contrat->enabled) + { + $ret=$product->load_stats_contrat($socid); + if ($ret < 0) dolibarr_print_error($db); + $langs->load("contracts"); + print ''; + print ''; + } + // Factures + if ($conf->facture->enabled) + { + $ret=$product->load_stats_facture($socid); + if ($ret < 0) dolibarr_print_error($db); + $langs->load("bills"); + print ''; + print ''; + } + + print "
'.$langs->trans("Ref").''.$product->ref.'
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("SellingPrice").''.price($product->price).'
'.$langs->trans("Status").''; + if ($product->envente) print $langs->trans("OnSell"); + else print $langs->trans("NotOnSell"); + print '
'.$langs->trans("Referers").''.$langs->trans("NbOfCustomers").''.$langs->trans("NbOfReferers").''.$langs->trans("TotalQuantity").'
'; + print ''.$langs->trans("Proposals").''; + print ''; + print $product->stats_propale['customers']; + print ''; + print $product->stats_propale['nb']; + print ''; + print $product->stats_propale['qty']; + print '
'; + print ''.$langs->trans("Orders").''; + print ''; + print $product->stats_commande['customers']; + print ''; + print $product->stats_commande['nb']; + print ''; + print $product->stats_commande['qty']; + print '
'; + print ''.$langs->trans("Contracts").''; + print ''; + print $product->stats_contrat['customers']; + print ''; + print $product->stats_contrat['nb']; + print ''; + print $product->stats_contrat['qty']; + print '
'; + print ''.$langs->trans("Bills").''; + print ''; + print $product->stats_facture['customers']; + print ''; + print $product->stats_facture['nb']; + print ''; + print $product->stats_facture['qty']; + print '
"; + + print ''; + + + $sql = "SELECT distinct(s.nom), s.idp, s.code_client, c.rowid, c.total_ht as amount,"; + $sql.= " ".$db->pdate("c.date_creation")." as date, c.fk_statut as statut, c.rowid as commandeid"; + $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."commandedet as d"; + $sql.= " WHERE c.fk_soc = s.idp"; + $sql.= " AND d.fk_commande = c.rowid AND d.fk_product =".$product->id; + if ($socid) + { + $sql .= " AND f.fk_soc = $socid"; + } + $sql.= " ORDER BY $sortfield $sortorder "; + $sql.= $db->plimit($conf->liste_limit +1, $offset); + + $result = $db->query($sql); + if ($result) + { + $num = $db->num_rows($result); + + print_barre_liste($langs->trans("Orders"),$page,$_SERVER["PHP_SELF"],"&id=$product->id",$sortfield,$sortorder,'',$num); + + $i = 0; + print ""; + + print ''; + print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"c.rowid","","&id=".$_GET["id"],'',$sortfield); + print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&id=".$_GET["id"],'',$sortfield); + print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","","&id=".$_GET["id"],'',$sortfield); + print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"c.date_creation","","&id=".$_GET["id"],'align="center"',$sortfield); + print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"c.amount_ht","","&id=".$_GET["id"],'align="right"',$sortfield); + print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"c.fk_statut","","&id=".$_GET["id"],'align="center"',$sortfield); + print "\n"; + + if ($num > 0) + { + $var=True; + while ($i < $num && $i < $conf->liste_limit) + { + $objp = $db->fetch_object($result); + $var=!$var; + + print ""; + print '\n"; + print ''; + print "\n"; + print ""; + print "\n"; + $fac=new Commande($db); + print ''; + print "\n"; + $i++; + } + } + } + else + { + dolibarr_print_error($db); + } + print "
'.img_object($langs->trans("ShowOrder"),"order").' '; + print $objp->rowid; + print "'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,44).'".$objp->code_client.""; + print dolibarr_print_date($objp->date)."".price($objp->amount)."'.$fac->LibStatut($objp->statut,1).'
"; + print '
'; + $db->free($result); + } +} +else +{ + dolibarr_print_error(); +} + +$db->close(); + +llxFooter('$Date$ - $Revision$'); +?> diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php new file mode 100644 index 00000000000..5cc14245176 --- /dev/null +++ b/htdocs/product/stats/contrat.php @@ -0,0 +1,315 @@ + + * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2005 Regis Houssin + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ + * $Source$ + */ + +/** + \file htdocs/product/stats/contrat.php + \ingroup product, service, contrat + \brief Page des stats des contrats pour un produit + \version $Revision$ +*/ + + +require("./pre.inc.php"); +include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); + +$langs->load("contracts"); + +$mesg = ''; + +$page = $_GET["page"]; +$sortfield=$_GET["sortfield"]; +$sortorder=$_GET["sortorder"]; +if ($page == -1) { $page = 0 ; } +$offset = $conf->liste_limit * $_GET["page"] ; +$pageprev = $_GET["page"] - 1; +$pagenext = $_GET["page"] + 1; +if (! $sortorder) $sortorder="DESC"; +if (! $sortfield) $sortfield="c.datec"; + + +if ($user->societe_id > 0) +{ + $action = ''; + $socid = $user->societe_id; +} +else +{ + $socid = 0; +} + + +/* + * Affiche fiche + * + */ + +llxHeader(); + + +if ($_GET["id"]) +{ + $product = new Product($db); + $result = $product->fetch($_GET["id"]); + + if ($result > 0) + { + /* + * En mode visu + */ + + $h=0; + + $head[$h][0] = DOL_URL_ROOT."/product/fiche.php?id=".$product->id; + $head[$h][1] = $langs->trans("Card"); + $h++; + + $head[$h][0] = DOL_URL_ROOT."/product/price.php?id=".$product->id; + $head[$h][1] = $langs->trans("Price"); + $h++; + + if($product->type == 0) + { + if ($user->rights->barcode->lire) + { + if ($conf->barcode->enabled) + { + $head[$h][0] = DOL_URL_ROOT."/product/barcode.php?id=".$product->id; + $head[$h][1] = $langs->trans("BarCode"); + $h++; + } + } + } + + + $head[$h][0] = DOL_URL_ROOT."/product/photos.php?id=".$product->id; + $head[$h][1] = $langs->trans("Photos"); + $h++; + + if($product->type == 0) + { + if ($conf->stock->enabled) + { + $head[$h][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$product->id; + $head[$h][1] = $langs->trans("Stock"); + $h++; + } + } + + if ($conf->fournisseur->enabled) + { + $head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$product->id; + $head[$h][1] = $langs->trans("Suppliers"); + $h++; + } + + $head[$h][0] = DOL_URL_ROOT."/product/stats/fiche.php?id=".$product->id; + $head[$h][1] = $langs->trans('Statistics'); + $h++; + + //erics: pour créer des produits composés de x 'sous' produits + $head[$h][0] = DOL_URL_ROOT."/product/pack.php?id=".$product->id; + $head[$h][1] = $langs->trans('Packs'); + $h++; + + $head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?id=".$product->id; + $head[$h][1] = $langs->trans('Referers'); + $hselected=$h; + $h++; + + $head[$h][0] = DOL_URL_ROOT.'/product/document.php?id='.$product->id; + $head[$h][1] = $langs->trans('Documents'); + $h++; + + dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref); + + + print ''; + + print ''; + print ''; + print ''; + print ''; + print ''; + + // Prix + print ''; + + // Statut + print ''; + + print ''; + print ''; + print ''; + print ''; + print ''; + + // Propals + if ($conf->propal->enabled) + { + $ret=$product->load_stats_propale($socid); + if ($ret < 0) dolibarr_print_error($db); + $langs->load("propal"); + print ''; + print ''; + } + // Commandes + if ($conf->commande->enabled) + { + $ret=$product->load_stats_commande($socid); + if ($ret < 0) dolibarr_print_error($db); + $langs->load("orders"); + print ''; + print ''; + } + // Contrats + if ($conf->contrat->enabled) + { + $ret=$product->load_stats_contrat($socid); + if ($ret < 0) dolibarr_print_error($db); + $langs->load("contracts"); + print ''; + print ''; + } + // Factures + if ($conf->facture->enabled) + { + $ret=$product->load_stats_facture($socid); + if ($ret < 0) dolibarr_print_error($db); + $langs->load("bills"); + print ''; + print ''; + } + + print "
'.$langs->trans("Ref").''.$product->ref.'
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("SellingPrice").''.price($product->price).'
'.$langs->trans("Status").''; + if ($product->envente) print $langs->trans("OnSell"); + else print $langs->trans("NotOnSell"); + print '
'.$langs->trans("Referers").''.$langs->trans("NbOfCustomers").''.$langs->trans("NbOfReferers").''.$langs->trans("TotalQuantity").'
'; + print ''.$langs->trans("Proposals").''; + print ''; + print $product->stats_propale['customers']; + print ''; + print $product->stats_propale['nb']; + print ''; + print $product->stats_propale['qty']; + print '
'; + print ''.$langs->trans("Orders").''; + print ''; + print $product->stats_commande['customers']; + print ''; + print $product->stats_commande['nb']; + print ''; + print $product->stats_commande['qty']; + print '
'; + print ''.$langs->trans("Contracts").''; + print ''; + print $product->stats_contrat['customers']; + print ''; + print $product->stats_contrat['nb']; + print ''; + print $product->stats_contrat['qty']; + print '
'; + print ''.$langs->trans("Bills").''; + print ''; + print $product->stats_facture['customers']; + print ''; + print $product->stats_facture['nb']; + print ''; + print $product->stats_facture['qty']; + print '
"; + + print ''; + + + $sql = "SELECT distinct(s.nom), s.idp, s.code_client, c.rowid, "; + $sql.= " ".$db->pdate("c.datec")." as date, c.statut as statut, c.rowid as contratid"; + $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."contratdet as d"; + $sql.= " WHERE c.fk_soc = s.idp"; + $sql.= " AND d.fk_contrat = c.rowid AND d.fk_product =".$product->id; + if ($socid) + { + $sql .= " AND c.fk_soc = $socid"; + } + $sql.= " ORDER BY $sortfield $sortorder "; + $sql.= $db->plimit($conf->liste_limit +1, $offset); + + $result = $db->query($sql); + if ($result) + { + $num = $db->num_rows($result); + + print_barre_liste($langs->trans("Contrats"),$page,$_SERVER["PHP_SELF"],"&id=$product->id",$sortfield,$sortorder,'',$num); + + $i = 0; + print ""; + + print ''; + print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"c.rowid","","&id=".$_GET["id"],'',$sortfield); + print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&id=".$_GET["id"],'',$sortfield); + print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","","&id=".$_GET["id"],'',$sortfield); + print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"c.datec","","&id=".$_GET["id"],'align="center"',$sortfield); + print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"c.amount","","&id=".$_GET["id"],'align="right"',$sortfield); + print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"c.fk_statut","","&id=".$_GET["id"],'align="center"',$sortfield); + print "\n"; + + if ($num > 0) + { + $var=True; + while ($i < $num && $i < $conf->liste_limit) + { + $objp = $db->fetch_object($result); + $var=!$var; + + print ""; + print '\n"; + print ''; + print "\n"; + print ""; + print "\n"; + $fac=new Contrat($db); + print ''; + print "\n"; + $i++; + } + } + } + else + { + dolibarr_print_error($db); + } + print "
'.img_object($langs->trans("ShowContract"),"contract").' '; + print $objp->rowid; + print "'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,44).'".$objp->code_client.""; + print dolibarr_print_date($objp->date)."".price($objp->amount)."'.$fac->LibStatut($objp->paye,$objp->statut,1).'
"; + print '
'; + $db->free($result); + } +} +else +{ + dolibarr_print_error(); +} + +$db->close(); + +llxFooter('$Date$ - $Revision$'); +?> diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 465aa41835f..7d403999dcc 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -23,7 +23,7 @@ /** \file htdocs/product/stats/facture.php - \ingroup product, service + \ingroup product, service, facture \brief Page des stats des factures pour un produit \version $Revision$ */ @@ -39,17 +39,23 @@ $mesg = ''; $page = $_GET["page"]; $sortfield=$_GET["sortfield"]; $sortorder=$_GET["sortorder"]; +if ($page == -1) { $page = 0 ; } +$offset = $conf->liste_limit * $_GET["page"] ; +$pageprev = $_GET["page"] - 1; +$pagenext = $_GET["page"] + 1; if (! $sortorder) $sortorder="DESC"; if (! $sortfield) $sortfield="f.datef"; -if ($page == -1) $page = 0; -$limit = $conf->liste_limit; -$offset = $limit * $page ; + if ($user->societe_id > 0) { $action = ''; $socid = $user->societe_id; } +else +{ + $socid = 0; +} /* @@ -233,39 +239,42 @@ if ($_GET["id"]) print ''; - print_barre_liste($langs->trans("Bills"),$page,"facture.php","&id=$product->id",$sortfield,$sortorder); - $sql = "SELECT s.nom, s.idp, s.code_client, f.facnumber, f.amount,"; - $sql.= " ".$db->pdate("f.datef")." as df, f.paye, f.fk_statut as statut, f.rowid as facid"; - $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."facturedet as d WHERE f.fk_soc = s.idp"; + $sql = "SELECT distinct(s.nom), s.idp, s.code_client, f.facnumber, f.amount as amount,"; + $sql.= " ".$db->pdate("f.datef")." as date, f.paye, f.fk_statut as statut, f.rowid as facid"; + $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."facturedet as d"; + $sql.= " WHERE f.fk_soc = s.idp"; $sql.= " AND d.fk_facture = f.rowid AND d.fk_product =".$product->id; if ($socid) { $sql .= " AND f.fk_soc = $socid"; } - $sql .= " ORDER BY $sortfield $sortorder "; - $sql .= $db->plimit( $limit ,$offset); + $sql.= " ORDER BY $sortfield $sortorder "; + $sql.= $db->plimit($conf->liste_limit +1, $offset); $result = $db->query($sql); - if ($result) { + if ($result) + { $num = $db->num_rows($result); + print_barre_liste($langs->trans("Bills"),$page,$_SERVER["PHP_SELF"],"&id=$product->id",$sortfield,$sortorder,'',$num); + $i = 0; print ""; print ''; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"s.idp","","&id=".$_GET["id"],'',$sortfield); print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&id=".$_GET["id"],'',$sortfield); - print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","","&id=".$_GET["id"],'align="right"',$sortfield); - print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"f.datef","","&id=".$_GET["id"],'align="right"',$sortfield); - print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"f.amount","","&id=".$_GET["id"],'align="right"',$sortfield); + print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","","&id=".$_GET["id"],'',$sortfield); + print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"f.datef","","&id=".$_GET["id"],'align="center"',$sortfield); + print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.amount","","&id=".$_GET["id"],'align="right"',$sortfield); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&id=".$_GET["id"],'align="center"',$sortfield); print "\n"; if ($num > 0) { $var=True; - while ($i < $num) + while ($i < $num && $conf->liste_limit) { $objp = $db->fetch_object($result); $var=!$var; @@ -276,8 +285,8 @@ if ($_GET["id"]) print "\n"; print ''; print "\n"; - print ""; + print ""; print "\n"; $fac=new Facture($db); print ''; @@ -286,7 +295,8 @@ if ($_GET["id"]) } } } - else { + else + { dolibarr_print_error($db); } print "
'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,44).'".$objp->code_client.""; - print dolibarr_print_date($objp->df).""; + print dolibarr_print_date($objp->date)."".price($objp->amount)."'.$fac->LibStatut($objp->paye,$objp->statut,1).'
"; diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index d18a041f941..6ff85888066 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -18,28 +18,31 @@ * * $Id$ * $Source$ - * */ -/** \file htdocs/product/stats/propal.php - \ingroup product, service +/** + \file htdocs/product/stats/propal.php + \ingroup product, service, propal \brief Page des stats des propals pour un produit \version $Revision$ */ require("./pre.inc.php"); +include_once(DOL_DOCUMENT_ROOT."/propal.class.php"); $mesg = ''; $page = $_GET["page"]; $sortfield=$_GET["sortfield"]; $sortorder=$_GET["sortorder"]; +if ($page == -1) { $page = 0 ; } +$offset = $conf->liste_limit * $_GET["page"] ; +$pageprev = $_GET["page"] - 1; +$pagenext = $_GET["page"] + 1; if (! $sortorder) $sortorder="DESC"; if (! $sortfield) $sortfield="p.datec"; -if ($page == -1) $page = 0; -$limit = $conf->liste_limit; -$offset = $limit * $page ; + if ($user->societe_id > 0) { @@ -129,13 +132,22 @@ if ($_GET["id"]) $hselected=$h; $h++; + $head[$h][0] = DOL_URL_ROOT.'/product/document.php?id='.$product->id; + $head[$h][1] = $langs->trans('Documents'); + $h++; dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref); - print ''; - print ''; + + print '
'.$langs->trans("Ref").''.$product->ref.'
'; + + print ''; + print ''; print ''; - print ''; + print ''; + print ''; + + // Prix print ''; // Statut @@ -223,49 +235,54 @@ if ($_GET["id"]) print ''; - print_barre_liste($langs->trans("Proposals"),$page,"propal.php","&id=$product->id",$sortfield,$sortorder); - - $sql = "SELECT distinct(p.rowid), s.nom,s.idp, p.ref,".$db->pdate("p.datep")." as df,p.rowid as facid"; - $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."propaldet as d WHERE p.fk_soc = s.idp"; - $sql .= " AND d.fk_propal = p.rowid AND d.fk_product =".$product->id; + $sql = "SELECT distinct(s.nom), s.idp, p.rowid as propalid, p.ref, p.total as amount,"; + $sql.= $db->pdate("p.datec")." as date, p.fk_statut as statut"; + $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."propaldet as d"; + $sql.= " WHERE p.fk_soc = s.idp"; + $sql.= " AND d.fk_propal = p.rowid AND d.fk_product =".$product->id; if ($socid) { $sql .= " AND p.fk_soc = $socid"; } - $sql .= " ORDER BY $sortfield $sortorder "; - $sql .= $db->plimit( $limit ,$offset); + $sql.= $db->plimit($conf->liste_limit +1, $offset); $result = $db->query($sql); if ($result) { $num = $db->num_rows($result); + print_barre_liste($langs->trans("Proposals"),$page,$_SERVER["PHP_SELF"],"&id=$product->id",$sortfield,$sortorder,'',$num); + $i = 0; print "
'.$langs->trans("Ref").''.$product->ref.'
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("SellingPrice").''.price($product->price).'
"; print ''; - print_liste_field_titre($langs->trans("Ref"),"propal.php","p.rowid","","&id=".$_GET["id"],'',$sortfield); - print_liste_field_titre($langs->trans("Company"),"propal.php","s.nom","","&id=".$_GET["id"],'',$sortfield); - print_liste_field_titre($langs->trans("Date"),"propal.php","f.datef","","&id=".$_GET["id"],'align="right"',$sortfield); + print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"p.rowid","","&id=".$_GET["id"],'',$sortfield); + print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&id=".$_GET["id"],'',$sortfield); + print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"p.datec","","&id=".$_GET["id"],'align="center"',$sortfield); + print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"p.total","","&id=".$_GET["id"],'align="right"',$sortfield); + print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"p.fk_statut","","&id=".$_GET["id"],'align="center"',$sortfield); print "\n"; if ($num > 0) { $var=True; - while ($i < $num) + while ($i < $num && $i < $conf->liste_limit) { $objp = $db->fetch_object($result); $var=!$var; print ""; - print '\n"; - print ''; - print ""; + print ''; + print ""; + print "\n"; + $prop=new Propal($db); + print ''; print "\n"; $i++; } @@ -276,6 +293,7 @@ if ($_GET["id"]) dolibarr_print_error($db); } print "
'; - print img_object($langs->trans("ShowPropal"),"propal").' '; + print ''.img_object($langs->trans("ShowPropal"),"propal").' '; print $objp->ref; print "'.img_object($langs->trans("ShowCompany"),"company").' '.$objp->nom.'"; - print strftime("%d %B %Y",$objp->df)."'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($objp->nom,44).'"; + print dolibarr_print_date($objp->date)."".price($objp->amount)."'.$prop->LibStatut($objp->statut,1).'
"; + print '
'; $db->free($result); } }