diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang index 923aef748559a11623d0c88a8b0d38a66f7150f7..b021e7e6d0ed4dcb3eb1aab14cd99785fb1d56c8 100644 --- a/htdocs/langs/en_US/boxes.lang +++ b/htdocs/langs/en_US/boxes.lang @@ -23,6 +23,7 @@ BoxTitleLastRssInfos=Last %s news from %s BoxTitleLastProducts=Last %s modified products/services BoxTitleLastCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=Last %s recorded suppliers +BoxTitleLastCustomers=Last %s recorded customers BoxTitleLastCustomersOrProspects=Last %s recorded customers or prospects BoxTitleLastPropals=Last %s recorded proposals BoxTitleLastCustomerBills=Last %s customer's invoices diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang index a98a3ad8c8cd84fc42ef5362b1aac2cc7ea77de1..6af026fdadd767ed573b1e1c343d5cccffc58b07 100644 --- a/htdocs/langs/fr_FR/boxes.lang +++ b/htdocs/langs/fr_FR/boxes.lang @@ -23,6 +23,7 @@ BoxTitleLastRssInfos=Les %s derni BoxTitleLastProducts=Les %s derniers produits/services enregistr�s BoxTitleLastCustomerOrders=Les %s derni�res commandes clients modifi�es BoxTitleLastSuppliers=Les %s derniers fournisseurs enregistr�s +BoxTitleLastCustomers=Les %s derniers clients enregistr�s BoxTitleLastCustomersOrProspects=Les %s derniers clients ou prospects enregistr�s BoxTitleLastPropals=Les %s derni�res propositions enregistr�s BoxTitleLastCustomerBills=Les %s derni�res factures clients enregistr�es diff --git a/htdocs/lib/databases/mssql.lib.php b/htdocs/lib/databases/mssql.lib.php index 102f770d984659f497176217b8f478e27719159f..7ecd67799a57b96b64fdd337238d288e044ef845 100644 --- a/htdocs/lib/databases/mssql.lib.php +++ b/htdocs/lib/databases/mssql.lib.php @@ -25,11 +25,8 @@ \version $Id$ */ // Pour compatibilit� lors de l'upgrade -if (! defined('DOL_DOCUMENT_ROOT')) -{ - define('DOL_DOCUMENT_ROOT', '../..'); -} -include_once(DOL_DOCUMENT_ROOT."/includes/adodbtime/adodb-time.inc.php"); +if (! defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '../..'); +if (! defined('ADODB_DATE_VERSION')) include_once(DOL_DOCUMENT_ROOT."/includes/adodbtime/adodb-time.inc.php"); /** diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php index 7b1f7a9df5ca9dfd1aee488a3dcb793035e74f80..8767d2f91405022bb6e3a508b3ae40e73a8a4dde 100644 --- a/htdocs/lib/databases/mysql.lib.php +++ b/htdocs/lib/databases/mysql.lib.php @@ -26,11 +26,8 @@ \version $Id$ */ // Pour compatibilit� lors de l'upgrade -if (! defined('DOL_DOCUMENT_ROOT')) -{ - define('DOL_DOCUMENT_ROOT', '../..'); -} -include_once(DOL_DOCUMENT_ROOT."/includes/adodbtime/adodb-time.inc.php"); +if (! defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '../..'); +if (! defined('ADODB_DATE_VERSION')) include_once(DOL_DOCUMENT_ROOT."/includes/adodbtime/adodb-time.inc.php"); /** diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php index 3f5b631f9a4d2fa12f5d08869f3fa7a26af7034c..3931ad54673d65351c88b579eb14e32d111b8e5d 100644 --- a/htdocs/lib/databases/mysqli.lib.php +++ b/htdocs/lib/databases/mysqli.lib.php @@ -26,11 +26,8 @@ \version $Id$ */ // Pour compatibilit� lors de l'upgrade -if (! defined('DOL_DOCUMENT_ROOT')) -{ - define('DOL_DOCUMENT_ROOT', '../..'); -} -include_once(DOL_DOCUMENT_ROOT."/includes/adodbtime/adodb-time.inc.php"); +if (! defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '../..'); +if (! defined('ADODB_DATE_VERSION')) include_once(DOL_DOCUMENT_ROOT."/includes/adodbtime/adodb-time.inc.php"); /** diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.lib.php index 3460b8513c7f19a8d62d8d1da06528600a8b40f4..4c448f4c9d75ac112a9f545c6896968dbb44b1a3 100644 --- a/htdocs/lib/databases/pgsql.lib.php +++ b/htdocs/lib/databases/pgsql.lib.php @@ -26,11 +26,8 @@ \version $Id$ */ // Pour compatibilit� lors de l'upgrade -if (! defined('DOL_DOCUMENT_ROOT')) -{ - define('DOL_DOCUMENT_ROOT', '../..'); -} -include_once(DOL_DOCUMENT_ROOT."/includes/adodbtime/adodb-time.inc.php"); +if (! defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '../..'); +if (! defined('ADODB_DATE_VERSION')) include_once(DOL_DOCUMENT_ROOT."/includes/adodbtime/adodb-time.inc.php"); /** diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index 1e6723cf2a87f6a85ed0704a4bf6d3a48d2c773b..c427de313dff5303a25f6eb385326ca7cf438908 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -30,12 +30,8 @@ */ // Pour compatibilit� lors de l'upgrade -if (! defined('DOL_DOCUMENT_ROOT')) -{ - define('DOL_DOCUMENT_ROOT', '..'); -} - -include_once(DOL_DOCUMENT_ROOT."/includes/adodbtime/adodb-time.inc.php"); +if (! defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '..'); +if (! defined('ADODB_DATE_VERSION')) include_once(DOL_DOCUMENT_ROOT."/includes/adodbtime/adodb-time.inc.php"); diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php index 562201357fd6124d1a72362b04e253c36e6e6daa..302f17b69b393663ea6a3aa1179d1d53aeb9fe00 100644 --- a/htdocs/product/stock/valo.php +++ b/htdocs/product/stock/valo.php @@ -1,6 +1,6 @@ <?php /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> - * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> + * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * * 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 @@ -15,15 +15,13 @@ * 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$ */ /** \file htdocs/product/stock/valo.php \ingroup stock \brief Page de valorisation des stocks - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); @@ -47,13 +45,17 @@ if ($page < 0) $page = 0; $limit = $conf->liste_limit; $offset = $limit * $page; +$year = strftime("%Y",time()); + /* - * Affichage valorisation par entrepot + * View */ + +// Affichage valorisation par entrepot $sql = "SELECT e.rowid as ref, e.label, e.statut, e.lieu, e.valo_pmp as valo"; $sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e"; -$sql .= " WHERE 1=1 "; +$sql .= " WHERE 1=1"; if ($sref) { $sql .= " AND e.ref like '%".$sref."%'"; @@ -63,7 +65,7 @@ if ($sall) $sql .= " AND (e.label like '%".addslashes($sall)."%' OR e.description like '%".addslashes($sall)."%' OR e.lieu like '%".addslashes($sall)."%' OR e.address like '%".addslashes($sall)."%' OR e.ville like '%".addslashes($sall)."%')"; } $sql .= " ORDER BY $sortfield $sortorder "; -$sql .= $db->plimit($limit + 1 ,$offset); +$sql .= $db->plimit($limit + 1, $offset); $result = $db->query($sql) ; if ($result) @@ -115,13 +117,17 @@ if ($result) print '<br />'; - $year = strftime("%Y",time()); - $url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&file=entrepot-'.$year.'.png'; - print '<img src="'.$url.'" alt="Valorisation du stock ann�e '.($year).'">'; + $file='entrepot-'.$year.'.png'; + if (file_exists(DOL_DATA_ROOT.'/graph/entrepot/'.$file)) + { + $url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&file='.$file; + print '<img src="'.$url.'" alt="Valorisation du stock ann�e '.($year).'">'; + } - if (file_exists(DOL_DATA_ROOT.'/graph/entrepot/entrepot-'.($year-1).'.png')) + $file='entrepot-'.($year-1).'.png'; + if (file_exists(DOL_DATA_ROOT.'/graph/entrepot/'.$file)) { - $url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&file=entrepot-'.($year-1).'.png'; + $url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&file='.$file; print '<br /><img src="'.$url.'" alt="Valorisation du stock ann�e '.($year-1).'">'; } diff --git a/mysql/migration/2.2.0-2.4.0.sql b/mysql/migration/2.2.0-2.4.0.sql index 5bfb4664dcabf674e9723f43ca0f3a427860a6ab..edd01a9e5b26c1a26476ee120fc214c450e677b0 100644 --- a/mysql/migration/2.2.0-2.4.0.sql +++ b/mysql/migration/2.2.0-2.4.0.sql @@ -225,3 +225,4 @@ update llx_actioncomm set datea2 = datea where datea2 is null and percent = 100; alter table llx_projet modify fk_soc integer; +update llx_rights_def set module='societe' where module='commercial' and perms='client' and subperms='voir'; diff --git a/scripts/cron/stock-graph.php b/scripts/cron/stock-graph.php index 365f0561d88b076a249bb41e8d05688e142618bf..693dd968854ff5445305f82ec1b9a0b85f6f1803 100644 --- a/scripts/cron/stock-graph.php +++ b/scripts/cron/stock-graph.php @@ -15,15 +15,13 @@ * 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 scripts/cron/stock-graph.php \ingroup stock \brief Cr�� le graph de valorisation du stock + \version $Id$ */ // Test si mode CLI @@ -42,7 +40,6 @@ $path=eregi_replace($script_file,'',$_SERVER["PHP_SELF"]); require_once($path."../../htdocs/master.inc.php"); - $error=0; $verbose = 0; @@ -61,20 +58,12 @@ for ($i = 1 ; $i < sizeof($argv) ; $i++) $verbose = 3; } } -/* - * - */ + + $dir = DOL_DATA_ROOT."/graph/entrepot"; -if (!is_dir($dir) ) -{ - if (! @mkdir($dir,0755)) - { - die ("Can't create $dir\n"); - } -} -/* - * - */ +$result=create_exdir($dir); + + $sql = "SELECT distinct(fk_entrepot)"; $sql .= " FROM ".MAIN_DB_PREFIX."entrepot_valorisation"; @@ -93,6 +82,7 @@ else { dolibarr_print_error($db,$sql); } + /* * */ @@ -106,7 +96,7 @@ for ($i = 0 ; $i < strftime('%j',$now) ; $i++) $values[$key][$i] = 0; } $values[0][$i] = 0; - $legends[$i] = strftime('%b',mktime(12,12,12,1,1,2006) + ($i * 3600 * 24)); + $legends[$i] = strftime('%b',dolibarr_mktime(12,0,0,1,1,2006) + ($i * 3600 * 24)); } /* @@ -164,7 +154,7 @@ for ($i = $max_day + 1 ; $i < ($day + 1) ; $i++) -require_once DOL_DOCUMENT_ROOT."/../external-libs/Artichow/LinePlot.class.php"; +require_once(DOL_DOCUMENT_ROOT."/../external-libs/Artichow/LinePlot.class.php"); foreach ($entrepots as $key => $ent) { @@ -190,6 +180,13 @@ if ($total[$key] > 0) if ($verbose) print "$file\n"; + +/** \brief Build graph +* \param file File +* \param title Title +* \param values Value +* \param legends Legend +*/ function graph_datas($file, $title, $values, $legends) {