diff --git a/ChangeLog b/ChangeLog index ad388c36239..cb938116f56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,11 +3,12 @@ English Dolibarr changelog ***** Changelog for 2.6 compared to 2.5 ***** For users: -- Enhance bank transactions reportings -- When creating a contact from a third party, informations from third party card +- New: Enhance bank transactions reportings. +- New: When creating a contact from a third party, informations from third party card are automatically suggested. -- Sort list of languages in combo box. +- New: Sort list of languages in combo box. - New: EMails links are show with function dol_print_email +- New: Add graph report on number of entities in product statistics page. - Fixed: Failed to go on the future view of bank transaction if there is no future bank transaction already wrote. - Fixed: Bad ref in supplier list. diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index f66c1d67987..8b1a26b4901 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -88,6 +88,16 @@ EnableGDLibraryDesc=Install or enable GD library with your PHP for use this opti EnablePhpAVModuleDesc=You need to install a module compatible with your anti-virus. (Clamav : php4-clamavlib ou php5-clamavlib) ProfIdShortDesc=Prof Id %s is an information depending on third party country.
For example, for country %s, it's code %s. DolibarrDemo=Dolibarr ERP/CRM demo +StatsByNumberOfUnits=Statistics in number of units +StatsByNumberOfEntities=Statistics in number of entities +NumberOfProposals=Number of proposals on last 12 month +NumberOfCustomerOrders=Number of customer orders on last 12 month +NumberOfCustomerInvoices=Number of customer invoices on last 12 month +NumberOfSupplierInvoices=Number of supplier invoices on last 12 month +NumberOfUnitsProposals=Number of units on proposals des 12 derniers mois +NumberOfUnitsCustomerOrders=Number of units on customer orders on last 12 month +NumberOfUnitsCustomerInvoices=Number of units on customer invoices on last 12 month +NumberOfUnitsSupplierInvoices=Number of units on supplier invoices on last 12 month ##### Bookmark ##### Bookmark=Bookmark diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang index e4cf05a2799..ac7a82ceffb 100644 --- a/htdocs/langs/fr_FR/other.lang +++ b/htdocs/langs/fr_FR/other.lang @@ -88,6 +88,16 @@ EnableGDLibraryDesc=Vous devez activer ou installer la librairie GD avec votre P EnablePhpAVModuleDesc=Vous devez installer un module PHP compatible avec votre anti-virus. (Clamav : php4-clamavlib ou php5-clamavlib) ProfIdShortDesc=Id prof. %s est une information qui dépend du pays du tiers.
Par exemple, pour le pays %s, il s'agit du code %s. DolibarrDemo=Démo de Dolibarr ERP/CRM +StatsByNumberOfUnits=Statistiques en nombre d'unités +StatsByNumberOfEntities=Statistiques en nombre d'entités +NumberOfProposals=Nombre de propal sur les 12 derniers mois +NumberOfCustomerOrders=Nombre de commande clients sur les 12 derniers mois +NumberOfCustomerInvoices=Nombre de facture clients sur les 12 derniers mois +NumberOfSupplierInvoices=Nombre de facture fournisseurs sur les 12 derniers mois +NumberOfUnitsProposals=Nombre d'unités sur les propal des 12 derniers mois +NumberOfUnitsCustomerOrders=Nombre d'unités sur les commandes clients des 12 derniers mois +NumberOfUnitsCustomerInvoices=Nombre d'unités sur les factures clients des 12 derniers mois +NumberOfUnitsSupplierInvoices=Nombre d'unités sur les factures fournisseurs des 12 derniers mois ##### Bookmark ##### Bookmark=Marque page diff --git a/htdocs/product.class.php b/htdocs/product.class.php index 8dd97ecfdc0..96ff18af38f 100644 --- a/htdocs/product.class.php +++ b/htdocs/product.class.php @@ -71,8 +71,8 @@ class Product extends CommonObject var $duration_unit; // Statut indique si le produit est en vente '1' ou non '0' var $status; - // Statut indique si le produit est un produit finis '1' ou une matiere premi�re '0' - var $finished; + // Statut indique si le produit est un produit finis '1' ou une matiere premi�re '0' + var $finished; //! Unites de mesure var $weight; @@ -170,7 +170,7 @@ class Product extends CommonObject if (empty($this->price_min)) $this->price_min = 0; if (empty($this->status)) $this->status = 0; if (empty($this->finished)) $this->finished = 0; - + $price_ht=0; $price_ttc=0; $price_min_ht=0; @@ -373,7 +373,7 @@ class Product extends CommonObject if (empty($this->tva_tx)) $this->tva_tx = 0; if (empty($this->finished)) $this->finished = 0; if (empty($this->seuil_stock_alerte)) $this->seuil_stock_alerte = 0; - + $sql = "UPDATE ".MAIN_DB_PREFIX."product "; $sql .= " SET label = '" . addslashes($this->libelle) ."'"; if ($this->ref) $sql .= ",ref = '" . $this->ref ."'"; @@ -740,24 +740,24 @@ class Product extends CommonObject */ function log_price_delete($user,$rowid) { - $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price"; - $sql.= " WHERE rowid=".$rowid; + $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price"; + $sql.= " WHERE rowid=".$rowid; + + dolibarr_syslog("Product::log_price_delete sql=".$sql); + $resql=$this->db->query($sql); + if ($resql) + { + return 1; + } + else + { + $this->error=$this->db->lasterror(); + return -1; + } - dolibarr_syslog("Product::log_price_delete sql=".$sql); - $resql=$this->db->query($sql); - if ($resql) - { - return 1; - } - else - { - $this->error=$this->db->lasterror(); - return -1; - } - } - + /** * \brief Lit le prix pratique par un fournisseur * On renseigne le couple prodfournprice/qty ou le triplet qty/product_id/fourn_ref) @@ -866,7 +866,7 @@ class Product extends CommonObject $price_min = price2num($newminprice) / (1 + ($newvat / 100)); $price_min = price2num($price_min,'MU'); } - else + else { $price_min=0; $price_min_ttc=0; @@ -884,14 +884,14 @@ class Product extends CommonObject $price_min_ttc = price2num($newminprice) * (1 + ($newvat / 100)); $price_min_ttc = price2num($price_min_ttc,'MU'); } - else + else { $price_min=0; $price_min_ttc=0; } } //print 'x'.$id.'-'.$newprice.'-'.$newpricebase.'-'.$price.'-'.$price_ttc.'-'.$price_min.'-'.$price_min_ttc; - + // Ne pas mettre de quote sur le numeriques decimaux. // Ceci provoque des stockage avec arrondis en base au lieu des valeurs exactes. $sql = "UPDATE ".MAIN_DB_PREFIX."product SET"; @@ -1397,23 +1397,25 @@ class Product extends CommonObject } /** - * \brief Return an array formated for showing graphs - * \param sql Request to execute - * \return array <0 if KO, result[i]=array(valuex,valuey); + * \brief Return an array formated for showing graphs + * \param sql Request to execute + * \param mode 'byunit'=number of unit, 'bynumber'=nb of entities + * \return array <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11 */ - function _get_stats($sql) + function _get_stats($sql,$mode) { - $result = $this->db->query($sql) ; - if ($result) + $resql = $this->db->query($sql); + if ($resql) { - $num = $this->db->num_rows($result); + $num = $this->db->num_rows($resql); $i = 0; while ($i < $num) - { - $arr = $this->db->fetch_array($result); - $tab[$arr[1]] = $arr[0]; - $i++; - } + { + $arr = $this->db->fetch_array($resql); + if ($mode == 'byunit') $tab[$arr[1]] = $arr[0]; // 1st field + if ($mode == 'bynumber') $tab[$arr[1]] = $arr[2]; // 3rd field + $i++; + } } else { @@ -1427,7 +1429,7 @@ class Product extends CommonObject for ($j = 0 ; $j < 12 ; $j++) { - $idx=ucfirst(substr(dolibarr_print_date(dolibarr_mktime(12,0,0,$month,1,$year),"%b") ,0,3) ); + $idx=ucfirst(substr(dolibarr_print_date(dolibarr_mktime(12,0,0,$month,1,$year),"%b"),0,3) ); $monthnum=sprintf("%02s",$month); $result[$j] = array($idx,isset($tab[$year.$month])?$tab[$year.$month]:0); @@ -1435,122 +1437,129 @@ class Product extends CommonObject $month = "0".($month - 1); if (strlen($month) == 3) - { - $month = substr($month,1); - } - if ($month == 0) - { - $month = 12; - $year = $year - 1; - } + { + $month = substr($month,1); + } + if ($month == 0) + { + $month = 12; + $year = $year - 1; + } } return array_reverse($result); - } /** - * \brief Renvoie le nombre de factures clients du produit/service par mois - * \param socid id societe - * \return array nombre de vente par mois + * \brief Return nb of units or customers invoices in which product is included + * \param socid Limit count on a particular third party id + * \param mode 'byunit'=number of unit, 'bynumber'=nb of entities + * \return array <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11 */ - function get_nb_vente($socid=0) + function get_nb_vente($socid=0,$mode) { global $conf; global $user; - $sql = "SELECT sum(d.qty), date_format(f.datef, '%Y%m') "; - $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as d, ".MAIN_DB_PREFIX."facture as f"; + $sql = "SELECT sum(d.qty), date_format(f.datef, '%Y%m')"; + if ($mode == 'bynumber') $sql.= ", count(DISTINCT f.rowid)"; + $sql.= " FROM ".MAIN_DB_PREFIX."facturedet as d, ".MAIN_DB_PREFIX."facture as f"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; - $sql .= " WHERE f.rowid = d.fk_facture and d.fk_product =".$this->id; + $sql.= " WHERE f.rowid = d.fk_facture and d.fk_product =".$this->id; if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid > 0) { $sql .= " AND f.fk_soc = $socid"; } - $sql .= " GROUP BY date_format(f.datef,'%Y%m') DESC ;"; + $sql.= " GROUP BY date_format(f.datef,'%Y%m') DESC"; - return $this->_get_stats($sql); + return $this->_get_stats($sql,$mode); } /** - * \brief Renvoie le nombre de factures fournisseurs du produit/service par mois - * \param socid id societe - * \return array nombre d'achat par mois + * \brief Return nb of units or supplier invoices in which product is included + * \param socid Limit count on a particular third party id + * \param mode 'byunit'=number of unit, 'bynumber'=nb of entities + * \return array <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11 */ - function get_nb_achat($socid=0) + function get_nb_achat($socid=0,$mode) { global $conf; global $user; - $sql = "SELECT sum(d.qty), date_format(f.datef, '%Y%m') "; - $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as d, ".MAIN_DB_PREFIX."facture_fourn as f"; + $sql = "SELECT sum(d.qty), date_format(f.datef, '%Y%m')"; + if ($mode == 'bynumber') $sql.= ", count(DISTINCT f.rowid)"; + $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as d, ".MAIN_DB_PREFIX."facture_fourn as f"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; - $sql .= " WHERE f.rowid = d.fk_facture_fourn and d.fk_product =".$this->id; + $sql.= " WHERE f.rowid = d.fk_facture_fourn and d.fk_product =".$this->id; if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid > 0) { $sql .= " AND f.fk_soc = $socid"; } - $sql .= " GROUP BY date_format(f.datef,'%Y%m') DESC ;"; + $sql.= " GROUP BY date_format(f.datef,'%Y%m') DESC"; - $resarray=$this->_get_stats($sql); + $resarray=$this->_get_stats($sql,$mode); return $resarray; } /** - * \brief Renvoie le nombre de propales dans lesquelles figure le produit par mois - * \param socid id societe - * \return array nombre de propales par mois + * \brief Return nb of units or proposals in which product is included + * \param socid Limit count on a particular third party id + * \param mode 'byunit'=number of unit, 'bynumber'=nb of entities + * \return array <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11 */ - function get_nb_propal($socid=0) + function get_nb_propal($socid=0,$mode) { global $conf; global $user; - $sql = "SELECT sum(d.qty), date_format(p.datep, '%Y%m') "; - $sql .= " FROM ".MAIN_DB_PREFIX."propaldet as d, ".MAIN_DB_PREFIX."propal as p"; + $sql = "SELECT sum(d.qty), date_format(p.datep, '%Y%m')"; + if ($mode == 'bynumber') $sql.= ", count(DISTINCT p.rowid)"; + $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as d, ".MAIN_DB_PREFIX."propal as p"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; - $sql .= " WHERE p.rowid = d.fk_propal and d.fk_product =".$this->id; + $sql.= " WHERE p.rowid = d.fk_propal and d.fk_product =".$this->id; if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid > 0) { $sql .= " AND p.fk_soc = $socid"; } - $sql .= " GROUP BY date_format(p.datep,'%Y%m') DESC ;"; + $sql.= " GROUP BY date_format(p.datep,'%Y%m') DESC"; - return $this->_get_stats($sql); + return $this->_get_stats($sql,$mode); } /** - * \brief Renvoie le nombre de commandes dans lesquelles figure le produit par mois - * \param socid id societe - * \return array nombre de commandes par mois + * \brief Return nb of units or orders in which product is included + * \param socid Limit count on a particular third party id + * \param mode 'byunit'=number of unit, 'bynumber'=nb of entities + * \return array <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11 */ - function get_nb_order($socid=0) + function get_nb_order($socid=0,$mode) { global $conf, $user; - $sql = "SELECT sum(d.qty), date_format(p.date_commande, '%Y%m') "; - $sql .= " FROM ".MAIN_DB_PREFIX."commandedet as d, ".MAIN_DB_PREFIX."commande as p"; + $sql = "SELECT sum(d.qty), date_format(p.date_commande, '%Y%m')"; + if ($mode == 'bynumber') $sql.= ", count(DISTINCT p.rowid)"; + $sql.= " FROM ".MAIN_DB_PREFIX."commandedet as d, ".MAIN_DB_PREFIX."commande as p"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; - $sql .= " WHERE p.rowid = d.fk_commande and d.fk_product =".$this->id; + $sql.= " WHERE p.rowid = d.fk_commande and d.fk_product =".$this->id; if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid > 0) { $sql .= " AND p.fk_soc = $socid"; } - $sql .= " GROUP BY date_format(p.date_commande,'%Y%m') DESC ;"; + $sql.= " GROUP BY date_format(p.date_commande,'%Y%m') DESC"; - return $this->_get_stats($sql); + return $this->_get_stats($sql,$mode); } /** * \brief Lie un produit associe au produit/service - * \param id_pere Id du produit auquel sera li� le produit � lier - * \param id_fils Id du produit � lier + * \param id_pere Id du produit auquel sera lie le produit a lier + * \param id_fils Id du produit a lier * \return int < 0 si erreur, > 0 si ok */ function add_sousproduit($id_pere, $id_fils,$qty) @@ -1567,38 +1576,37 @@ class Product extends CommonObject $sql = 'select fk_product_pere from '.MAIN_DB_PREFIX.'product_association'; $sql .= ' WHERE fk_product_pere = "'.$id_fils.'" and fk_product_fils = "'.$id_pere.'"'; if (! $this->db->query($sql)) - { - dolibarr_print_error($this->db); - return -1; - } - else - { - $result = $this->db->query($sql) ; - if ($result) - { - $num = $this->db->num_rows($result); - if($num > 0) - { - $this->error="isFatherOfThis"; - return -1; - } - else - { - $sql = 'insert into '.MAIN_DB_PREFIX.'product_association(fk_product_pere,fk_product_fils,qty)'; - $sql .= ' VALUES ("'.$id_pere.'","'.$id_fils.'","'.$qty.'")'; - if (! $this->db->query($sql)) - { - dolibarr_print_error($this->db); - return -1; - } - else - { - return 1; - } - } - } - } - + { + dolibarr_print_error($this->db); + return -1; + } + else + { + $result = $this->db->query($sql) ; + if ($result) + { + $num = $this->db->num_rows($result); + if($num > 0) + { + $this->error="isFatherOfThis"; + return -1; + } + else + { + $sql = 'insert into '.MAIN_DB_PREFIX.'product_association(fk_product_pere,fk_product_fils,qty)'; + $sql .= ' VALUES ("'.$id_pere.'","'.$id_fils.'","'.$qty.'")'; + if (! $this->db->query($sql)) + { + dolibarr_print_error($this->db); + return -1; + } + else + { + return 1; + } + } + } + } } } @@ -2169,17 +2177,17 @@ class Product extends CommonObject } return $langs->trans('Unknown'); } - - + + /** - * \brief Retourne le libell� du finished du produit - * \return string Libelle - */ + * \brief Retourne le libell� du finished du produit + * \return string Libelle + */ function getLibFinished() { global $langs; $langs->load('products'); - + if ($this->finished == '0') return $langs->trans("RowMaterial"); if ($this->finished == '1') return $langs->trans("Finished"); return ''; diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php index a77cbda2610..7b34bf5f402 100644 --- a/htdocs/product/stats/fiche.php +++ b/htdocs/product/stats/fiche.php @@ -1,6 +1,6 @@ - * Copyright (c) 2004-2007 Laurent Destailleur + * Copyright (c) 2004-2009 Laurent Destailleur * Copyright (C) 2005 Regis Houssin * Copyright (C) 2005 Eric Seigne * @@ -20,11 +20,11 @@ */ /** - \file htdocs/product/stats/fiche.php - \ingroup product - \brief Page des stats produits - \version $Id$ -*/ + * \file htdocs/product/stats/fiche.php + * \ingroup product + * \brief Page des stats produits + * \version $Id$ + */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); @@ -35,6 +35,9 @@ require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); $langs->load("companies"); $langs->load("products"); $langs->load("bills"); +$langs->load("other"); + +$mode=isset($_GET["mode"])?$_GET["mode"]:'byunit'; if ($user->societe_id > 0) { @@ -65,11 +68,6 @@ if ($_GET["id"] || $_GET["ref"]) if ($result) { - // Efface rep obsolete - if(is_dir(DOL_DOCUMENT_ROOT."/document/produits")) - rmdir(DOL_DOCUMENT_ROOT."/document/produits"); - - $head=product_prepare_head($product, $user); $titre=$langs->trans("CardProduct".$product->type); dolibarr_fiche_head($head, 'stats', $titre); @@ -124,6 +122,19 @@ if ($_GET["id"] || $_GET["ref"]) print ''; + // Choice of stats + if ($mode == 'bynumber') print ''; + else print img_picto('','tick').' '; + print $langs->trans("StatsByNumberOfUnits"); + if ($mode == 'bynumber') print ''; + print '       '; + if ($mode == 'byunit') print ''; + else print img_picto('','tick').' '; + print $langs->trans("StatsByNumberOfEntities"); + if ($mode == 'byunit') print ''; + + print '

'; + print ''; // Generation des graphs @@ -141,16 +152,16 @@ if ($_GET["id"] || $_GET["ref"]) $graphfiles=array( 'propal' =>array('modulepart'=>'productstats_proposals', 'file' => $product->id.'/propal12m.png', - 'label' => $langs->trans("Nombre propal sur les 12 derniers mois")), + 'label' => ($mode=='byunit'?$langs->trans("NumberOfUnitsProposals"):$langs->trans("NumberOfProposals"))), 'orders' =>array('modulepart'=>'productstats_orders', 'file' => $product->id.'/orders12m.png', - 'label' => $langs->trans("Nombre commande clients sur les 12 derniers mois")), + 'label' => ($mode=='byunit'?$langs->trans("NumberOfUnitsCustomerOrders"):$langs->trans("NumberOfCustomerOrders"))), 'invoices' =>array('modulepart'=>'productstats_invoices', 'file' => $product->id.'/invoices12m.png', - 'label' => $langs->trans("Nombre facture clients sur les 12 derniers mois")), + 'label' => ($mode=='byunit'?$langs->trans("NumberOfUnitsCustomerInvoices"):$langs->trans("NumberOfCustomerInvoices"))), 'invoicessuppliers'=>array('modulepart'=>'productstats_invoicessuppliers', 'file' => $product->id.'/invoicessuppliers12m.png', - 'label' => $langs->trans("Nombre facture fournisseurs sur les 12 derniers mois")), + 'label' => ($mode=='byunit'?$langs->trans("NumberOfUnitsSupplierInvoices"):$langs->trans("NumberOfSupplierInvoices"))), // 'orderssuppliers' =>array('modulepart'=>'productstats_orderssuppliers', 'file' => $product->id.'/orderssuppliers12m.png', 'label' => $langs->trans("Nombre commande fournisseurs sur les 12 derniers mois")), // 'contracts' =>array('modulepart'=>'productstats_contracts', 'file' => $product->id.'/contracts12m.png', 'label' => $langs->trans("Nombre contrats sur les 12 derniers mois")), @@ -168,10 +179,10 @@ if ($_GET["id"] || $_GET["ref"]) $graph_data = array(); // \todo Test si deja existant et recent, on ne genere pas - if ($key == 'propal') $graph_data = $product->get_nb_propal($socid); - if ($key == 'orders') $graph_data = $product->get_nb_order($socid); - if ($key == 'invoices') $graph_data = $product->get_nb_vente($socid); - if ($key == 'invoicessuppliers') $graph_data = $product->get_nb_achat($socid); + if ($key == 'propal') $graph_data = $product->get_nb_propal($socid,$mode); + if ($key == 'orders') $graph_data = $product->get_nb_order($socid,$mode); + if ($key == 'invoices') $graph_data = $product->get_nb_vente($socid,$mode); + if ($key == 'invoicessuppliers') $graph_data = $product->get_nb_achat($socid,$mode); if (is_array($graph_data)) { $px->SetData($graph_data); @@ -234,7 +245,7 @@ if ($_GET["id"] || $_GET["ref"]) { print ''; } - print ''; + print ''; print ''; print '
'.($mesg?''.$mesg.'':$langs->trans("ChartNotGenerated")).''.img_picto($langs->trans("ReCalculate"),'refresh').''.img_picto($langs->trans("ReCalculate"),'refresh').'
';