From ee67e3c79b84114e012a1853ec41f60f4ea22af4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 18 Mar 2006 18:32:08 +0000 Subject: [PATCH] =?UTF-8?q?Qual:=20Suppression=20table=20utilis=E9e=20null?= =?UTF-8?q?e=20part?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/comm/fiche.php | 8 ------- htdocs/compta/clients.php | 7 ------ htdocs/compta/fiche.php | 7 ------ mysql/convert-innodb.sql | 2 -- mysql/drop.sql | 2 -- mysql/innodb.sql | 2 -- mysql/migration/2.0.0-2.1.0.sql | 3 +++ mysql/tables/llx_soc_recontact.sql | 31 -------------------------- pgsql/drop.sql | 2 -- pgsql/tables/llx_soc_recontact.sql | 35 ------------------------------ 10 files changed, 3 insertions(+), 96 deletions(-) delete mode 100644 mysql/tables/llx_soc_recontact.sql delete mode 100644 pgsql/tables/llx_soc_recontact.sql diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 0cf203a7eee..7f5be045ac6 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -112,14 +112,6 @@ if ($_POST["action"] == 'setassujtva') if (! $result) dolibarr_print_error($result); } -if ($action == 'recontact') -{ - $dr = mktime(0, 0, 0, $remonth, $reday, $reyear); - $sql = "INSERT INTO ".MAIN_DB_PREFIX."soc_recontact (fk_soc, datere, author) VALUES ($socidp, $dr,'". $user->login ."')"; - $result = $db->query($sql); - if (! $result) dolibarr_print_error($result); -} - if ($action == 'stcomm') { if ($stcommid <> 'null' && $stcommid <> $oldstcomm) diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index 7dbddabff6e..46449029056 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -67,13 +67,6 @@ if ($action == 'attribute_prefix') $societe->attribute_prefix($db, $socid); } -if ($action == 'recontact') -{ - $dr = mktime(0, 0, 0, $remonth, $reday, $reyear); - $sql = "INSERT INTO ".MAIN_DB_PREFIX."soc_recontact (fk_soc, datere, author) VALUES ($socid, $dr,'". $user->login ."')"; - $result = $db->query($sql); -} - if ($action == 'note') { $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='$note' WHERE idp=$socid"; diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index 72e8090bebb..8065e7efd57 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.php @@ -64,13 +64,6 @@ if (!$user->rights->commercial->client->voir && $socid && !$user->societe_id > 0 } -if ($action == 'recontact') -{ - $dr = mktime(0, 0, 0, $remonth, $reday, $reyear); - $sql = "INSERT INTO ".MAIN_DB_PREFIX."soc_recontact (fk_soc, datere, author) VALUES ($socid, $dr,'". $user->login ."')"; - $result = $db->query($sql); -} - /* TODO RODO if ($action == 'stcomm') { diff --git a/mysql/convert-innodb.sql b/mysql/convert-innodb.sql index 2f1dc7ae6c7..082b6152e6e 100644 --- a/mysql/convert-innodb.sql +++ b/mysql/convert-innodb.sql @@ -152,8 +152,6 @@ alter table llx_socpeople type=INNODB; alter table llx_soc_events type=INNODB; -alter table llx_soc_recontact type=INNODB; - alter table llx_socstatutlog type=INNODB; alter table llx_sqltables type=INNODB; diff --git a/mysql/drop.sql b/mysql/drop.sql index 07990d60587..818001c82cf 100644 --- a/mysql/drop.sql +++ b/mysql/drop.sql @@ -189,8 +189,6 @@ drop table if exists llx_socpeople; drop table if exists llx_soc_events; -drop table if exists llx_soc_recontact; - drop table if exists llx_socstatutlog ; drop table if exists llx_stock; diff --git a/mysql/innodb.sql b/mysql/innodb.sql index 706e62cc375..6ba6f2cd409 100644 --- a/mysql/innodb.sql +++ b/mysql/innodb.sql @@ -189,8 +189,6 @@ alter table llx_socpeople type=INNODB; alter table llx_soc_events type=INNODB; -alter table llx_soc_recontact type=INNODB; - alter table llx_socstatutlog type=INNODB; alter table llx_stock type=INNODB; diff --git a/mysql/migration/2.0.0-2.1.0.sql b/mysql/migration/2.0.0-2.1.0.sql index b0d607437e7..0af189b6dfc 100644 --- a/mysql/migration/2.0.0-2.1.0.sql +++ b/mysql/migration/2.0.0-2.1.0.sql @@ -101,3 +101,6 @@ create table llx_avoir_model_pdf libelle varchar(255), description text )type=innodb; + + +drop table llx_soc_recontact if exists; diff --git a/mysql/tables/llx_soc_recontact.sql b/mysql/tables/llx_soc_recontact.sql deleted file mode 100644 index ee976a7c196..00000000000 --- a/mysql/tables/llx_soc_recontact.sql +++ /dev/null @@ -1,31 +0,0 @@ --- =================================================================== --- Copyright (C) 2002 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. --- --- Societes a recontacter --- --- $Id$ --- $Source$ --- --- =================================================================== - -create table llx_soc_recontact -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_soc integer, - datere datetime, - author varchar(15) -)type=innodb; diff --git a/pgsql/drop.sql b/pgsql/drop.sql index 7006fb4859f..728323450c3 100644 --- a/pgsql/drop.sql +++ b/pgsql/drop.sql @@ -181,8 +181,6 @@ drop table llx_socpeople; drop table llx_soc_events; -drop table llx_soc_recontact; - drop table llx_socstatutlog ; drop table llx_stock; diff --git a/pgsql/tables/llx_soc_recontact.sql b/pgsql/tables/llx_soc_recontact.sql deleted file mode 100644 index cc27b42faca..00000000000 --- a/pgsql/tables/llx_soc_recontact.sql +++ /dev/null @@ -1,35 +0,0 @@ --- Generated from dolibarr_mysql2pgsql --- (c) 2004, PostgreSQL Inc. --- (c) 2005, Laurent Destailleur. - --- =================================================================== --- Copyright (C) 2002 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. --- --- Societes a recontacter --- --- $Id$ --- $Source$ --- --- =================================================================== - -create table llx_soc_recontact -( - rowid SERIAL PRIMARY KEY, - "fk_soc" integer, - "datere" timestamp, - "author" varchar(15) -);