From c699cd548b720bed49df024b96e9054212b3f738 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 10 Jul 2009 08:52:50 +0000 Subject: [PATCH] Qual: Removed deprecated code --- htdocs/cron/functions_cron.lib.php | 60 +------------- mysql/migration/2.6.0-2.7.0.sql | 1 + mysql/tables/llx_facture_stats.sql | 28 ------- .../batch_fournisseur_updatestatsinvoice.php | 83 ------------------- 4 files changed, 5 insertions(+), 167 deletions(-) delete mode 100644 mysql/tables/llx_facture_stats.sql delete mode 100644 scripts/cron/batch_fournisseur_updatestatsinvoice.php diff --git a/htdocs/cron/functions_cron.lib.php b/htdocs/cron/functions_cron.lib.php index f131bc71125..5e4e59889f9 100644 --- a/htdocs/cron/functions_cron.lib.php +++ b/htdocs/cron/functions_cron.lib.php @@ -43,7 +43,7 @@ function batch_fournisseur_updateturnover($year) $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn"; $sql.= " WHERE entity = ".$conf->entity; $sql.= " GROUP BY fk_soc, date_format(datef,'%Y') "; - + $resql = $db->query($sql) ; if ($resql) @@ -93,7 +93,7 @@ function batch_fournisseur_updateturnover($year) $sql = "SELECT fk_product "; $sql.= " FROM ".MAIN_DB_PREFIX."product_subproduct"; $sql.= " WHERE fk_product_subproduct ='".$key."';"; - + $resql = $db->query($sql) ; if ($resql) @@ -130,7 +130,7 @@ function batch_fournisseur_updateturnover($year) $sql.= " AND f.rowid = fd.fk_facture"; $sql.= " WHERE f.entity = ".$conf->entity; $sql.= " AND date_format(f.datef,'%Y') = '".$year."';"; - + $resql = $db->query($sql) ; if ($resql) @@ -156,7 +156,7 @@ function batch_fournisseur_updateturnover($year) { $sqld = "DELETE FROM ".MAIN_DB_PREFIX."fournisseur_ca"; $sqld .= " WHERE year = ".$year." AND fk_societe = ".$key; - + $resqld = $db->query($sqld); if (! $resqld) { @@ -202,56 +202,4 @@ function batch_fournisseur_updateturnover($year) return 1; } - - -/** - * \brief Update table facture_stats - * \deprecated Function no more used - */ -function batch_fournisseur_statsinvoice() -{ - global $conf, $user, $db, $langs; - - $now=gmmktime(); - - $sql = "SELECT paye, count(*)"; - $sql.= " FROM ".MAIN_DB_PREFIX."facture"; - $sql.= " WHERE entity = ".$conf->entity; - $sql.= " GROUP BY paye"; - - $resql = $db->query($sql); - - if ($resql) - { - while ($row = $db->fetch_row($resql)) - { - $sqli = "INSERT INTO ".MAIN_DB_PREFIX."facture_stats"; - $sqli .= " VALUES (".$db->idate(mktime()).",".$db->idate($now).",'paye $row[0]',$row[1])"; - - $resqli = $db->query($sqli); - } - $db->free($resql); - } - - $sql = "SELECT paye, sum(total)"; - $sql.= " FROM ".MAIN_DB_PREFIX."facture"; - $sql.= " WHERE entity = ".$conf->entity; - $sql.= " GROUP BY paye"; - - $resql = $db->query($sql); - - if ($resql) - { - while ($row = $db->fetch_row($resql)) - { - $sqli = "INSERT INTO ".MAIN_DB_PREFIX."facture_stats"; - $sqli .= " VALUES (".$db->idate(mktime()).",".$db->idate($now).",'total $row[0]','$row[1]')"; - - $resqli = $db->query($sqli); - } - $db->free($resql); - } - - return 1; -} ?> diff --git a/mysql/migration/2.6.0-2.7.0.sql b/mysql/migration/2.6.0-2.7.0.sql index 431f75be50e..e61a1d9b551 100644 --- a/mysql/migration/2.6.0-2.7.0.sql +++ b/mysql/migration/2.6.0-2.7.0.sql @@ -6,6 +6,7 @@ -- when current version is 2.6.0 or higher. -- +drop table llx_facture_stats; drop table llx_stock_valorisation; drop table llx_entrepot_valorisation; diff --git a/mysql/tables/llx_facture_stats.sql b/mysql/tables/llx_facture_stats.sql deleted file mode 100644 index 1e7a03720ad..00000000000 --- a/mysql/tables/llx_facture_stats.sql +++ /dev/null @@ -1,28 +0,0 @@ --- =================================================================== --- Copyright (C) 2006 Rodolphe Quiedeville --- --- 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$ --- =================================================================== - -create table llx_facture_stats -( - date_full datetime, - date_day date, - data varchar(50), - value real - -)type=innodb; diff --git a/scripts/cron/batch_fournisseur_updatestatsinvoice.php b/scripts/cron/batch_fournisseur_updatestatsinvoice.php deleted file mode 100644 index 76ed6cca49e..00000000000 --- a/scripts/cron/batch_fournisseur_updatestatsinvoice.php +++ /dev/null @@ -1,83 +0,0 @@ - - * Copyright (C) 2007-2009 Laurent Destailleur - * - * 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. - */ - -/** - \file scripts/cron/batch_fournisseur_statsinvoice.php - \ingroup invoice - \brief Script de mise a jour de la table facture_stats de statistiques - \deprecated Ce script et ces tables ne sont pas utilisees. - \version $Id$ -*/ - -// Test si mode CLI -$sapi_type = php_sapi_name(); -$script_file=__FILE__; -if (eregi('([^\\\/]+)$',$script_file,$reg)) $script_file=$reg[1]; - -if (substr($sapi_type, 0, 3) == 'cgi') { - echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer $script_file en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; - exit; -} - -// Recupere env dolibarr -$version='$Revision$'; -$path=eregi_replace($script_file,'',$_SERVER["PHP_SELF"]); - -require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/cron/functions_cron.lib.php"); - -print '***** '.$script_file.' ('.$version.') *****'."\n"; -print '--- start'."\n"; - - -$error=0; -$verbose = 0; - -for ($i = 1 ; $i < sizeof($argv) ; $i++) -{ - if ($argv[$i] == "-v") - { - $verbose = 1; - } - if ($argv[$i] == "-vv") - { - $verbose = 2; - } - if ($argv[$i] == "-vvv") - { - $verbose = 3; - } -} - -$db->begin(); - -$result=batch_fournisseur_statsinvoice(); - -if ($result > 0) -{ - $db->commit(); - print '--- end ok'."\n"; -} -else -{ - print '--- end error code='.$result."\n"; - $db->rollback(); -} - -?>