Fix: Minor fixes

Qual: Remove deprecated file
This commit is contained in:
Laurent Destailleur
2008-03-05 18:33:31 +00:00
parent 0cad028fb8
commit 579c94d335
10 changed files with 47 additions and 57 deletions

View File

@@ -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

View File

@@ -23,6 +23,7 @@ BoxTitleLastRssInfos=Les %s derni
BoxTitleLastProducts=Les %s derniers produits/services enregistr<74>s
BoxTitleLastCustomerOrders=Les %s derni<6E>res commandes clients modifi<66>es
BoxTitleLastSuppliers=Les %s derniers fournisseurs enregistr<74>s
BoxTitleLastCustomers=Les %s derniers clients enregistr<74>s
BoxTitleLastCustomersOrProspects=Les %s derniers clients ou prospects enregistr<74>s
BoxTitleLastPropals=Les %s derni<6E>res propositions enregistr<74>s
BoxTitleLastCustomerBills=Les %s derni<6E>res factures clients enregistr<74>es

View File

@@ -25,11 +25,8 @@
\version $Id$
*/
// Pour compatibilit<69> 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");
/**

View File

@@ -26,11 +26,8 @@
\version $Id$
*/
// Pour compatibilit<69> 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");
/**

View File

@@ -26,11 +26,8 @@
\version $Id$
*/
// Pour compatibilit<69> 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");
/**

View File

@@ -26,11 +26,8 @@
\version $Id$
*/
// Pour compatibilit<69> 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");
/**

View File

@@ -30,12 +30,8 @@
*/
// Pour compatibilit<69> 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");

View File

@@ -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,10 +45,14 @@ 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";
@@ -115,13 +117,17 @@ if ($result)
print '<br />';
$year = strftime("%Y",time());
$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file=entrepot-'.$year.'.png';
print '<img src="'.$url.'" alt="Valorisation du stock ann<6E>e '.($year).'">';
if (file_exists(DOL_DATA_ROOT.'/graph/entrepot/entrepot-'.($year-1).'.png'))
$file='entrepot-'.$year.'.png';
if (file_exists(DOL_DATA_ROOT.'/graph/entrepot/'.$file))
{
$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file=entrepot-'.($year-1).'.png';
$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
print '<img src="'.$url.'" alt="Valorisation du stock ann<6E>e '.($year).'">';
}
$file='entrepot-'.($year-1).'.png';
if (file_exists(DOL_DATA_ROOT.'/graph/entrepot/'.$file))
{
$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
print '<br /><img src="'.$url.'" alt="Valorisation du stock ann<6E>e '.($year-1).'">';
}

View File

@@ -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';

View File

@@ -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<43><72> 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)
{