From e630cd96d3451b14beb62d84225d9f0ec46d8d9e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 18 Jan 2005 19:44:23 +0000 Subject: [PATCH] =?UTF-8?q?Qual:=20Suppression=20de=202=20champs=20non=20u?= =?UTF-8?q?tilis=E9s=20et=20obsol=E8tes=20par=20le=20nouveau=20system=20de?= =?UTF-8?q?s=20droits?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/user.class.php | 2 -- htdocs/user/index.php | 4 ++-- mysql/migration/1.1.0-1.2.0-RC1.sql | 27 +++------------------- mysql/tables/llx_cash.sql | 34 --------------------------- mysql/tables/llx_cash_account.sql | 36 ----------------------------- 5 files changed, 5 insertions(+), 98 deletions(-) delete mode 100644 mysql/tables/llx_cash.sql delete mode 100644 mysql/tables/llx_cash_account.sql diff --git a/htdocs/user.class.php b/htdocs/user.class.php index 3c11aff395d..279865b0044 100644 --- a/htdocs/user.class.php +++ b/htdocs/user.class.php @@ -844,8 +844,6 @@ class User $sql .= ", email = '$this->email'"; $sql .= ", admin = $this->admin"; $sql .= ", webcal_login = '$this->webcal_login'"; - $sql .= ", module_comm = 1"; - $sql .= ", module_compta = 1"; $sql .= ", code = '$this->code'"; $sql .= ", note = '$this->note'"; $sql .= " WHERE rowid = $this->id;"; diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 7a84fbdfa12..199ff31f9e2 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -21,7 +21,7 @@ * */ -/*! +/** \file htdocs/user/index.php \brief Page d'accueil de la gestion des utilisateurs \version $Revision$ @@ -44,7 +44,7 @@ if (! $sortfield) { print_titre($langs->trans("ListOfUsers")); -$sql = "SELECT u.rowid, u.name, u.firstname, u.code, u.login, u.module_comm, u.module_compta"; +$sql = "SELECT u.rowid, u.name, u.firstname, u.code, u.login"; $sql .= " FROM ".MAIN_DB_PREFIX."user as u"; if ($sortfield) { $sql.=" ORDER BY $sortfield $sortorder"; } diff --git a/mysql/migration/1.1.0-1.2.0-RC1.sql b/mysql/migration/1.1.0-1.2.0-RC1.sql index aecb5dec933..ed974f03a8f 100644 --- a/mysql/migration/1.1.0-1.2.0-RC1.sql +++ b/mysql/migration/1.1.0-1.2.0-RC1.sql @@ -5,6 +5,9 @@ -- sans AUCUNE erreur ni warning -- ; +alter table llx_user drop column module_comm; +alter table llx_user drop column module_compta; + alter table llx_user_rights add rowid integer AUTO_INCREMENT PRIMARY KEY; alter table llx_facture add fk_mode_reglement integer after fk_cond_reglement ; @@ -246,30 +249,6 @@ create table llx_user_param UNIQUE (fk_user,page,param) )type=innodb; -create table llx_cash_account -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - datec datetime, - tms timestamp, - label varchar(30), - courant smallint default 0 not null, - clos smallint default 0 not null, - account_number varchar(8) -)type=innodb; - -create table llx_cash -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - datec datetime, - dateo date NOT NULL, - amount real NOT NULL default 0, - label varchar(255), - fk_account integer, - fk_user_author integer, - fk_type varchar(4), - note text -)type=innodb; - update llx_bank set datev=dateo where datev is null; diff --git a/mysql/tables/llx_cash.sql b/mysql/tables/llx_cash.sql deleted file mode 100644 index 40444df4be6..00000000000 --- a/mysql/tables/llx_cash.sql +++ /dev/null @@ -1,34 +0,0 @@ --- =================================================================== --- Copyright (C) 2004 Laurent Destailleur --- --- $Id$ --- $Source$ --- --- 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. --- --- =================================================================== - -create table llx_cash -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - datec datetime, - dateo date NOT NULL, -- date operation - amount real NOT NULL default 0, - label varchar(255), - fk_account integer, -- Pour gerer plusieurs caisse - fk_user_author integer, - fk_type varchar(4), -- Liquide, retrait, depot - note text -)type=innodb; diff --git a/mysql/tables/llx_cash_account.sql b/mysql/tables/llx_cash_account.sql deleted file mode 100644 index 28eab106ffb..00000000000 --- a/mysql/tables/llx_cash_account.sql +++ /dev/null @@ -1,36 +0,0 @@ --- ============================================================================= --- Copyright (C) 2004 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. --- --- $Id$ --- $Source$ --- --- --- courant : indique si c'est un compte courant --- clos : le compte est-il clos ou encore ouvert --- --- ============================================================================= - -create table llx_cash_account -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - datec datetime, - tms timestamp, - label varchar(30), - courant smallint DEFAULT 0 NOT NULL, - clos smallint DEFAULT 0 NOT NULL, - account_number varchar(8) -)type=innodb;