diff --git a/mysql/migration/2.6.0-2.7.0.sql b/mysql/migration/2.6.0-2.7.0.sql index e61a1d9b551..89a2a5f216e 100644 --- a/mysql/migration/2.6.0-2.7.0.sql +++ b/mysql/migration/2.6.0-2.7.0.sql @@ -9,6 +9,8 @@ drop table llx_facture_stats; drop table llx_stock_valorisation; drop table llx_entrepot_valorisation; +drop table llx_groupesociete_remise; +drop table llx_groupesociete; update llx_actioncomm set datep = datec where datep is null and datec is not null; diff --git a/mysql/tables/llx_groupesociete.sql b/mysql/tables/llx_groupesociete.sql deleted file mode 100644 index 1cf25e53f5e..00000000000 --- a/mysql/tables/llx_groupesociete.sql +++ /dev/null @@ -1,33 +0,0 @@ --- ======================================================================== --- Copyright (C) 2000-2004 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_groupesociete -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - parent integer UNIQUE, - tms timestamp, - datec datetime, -- creation date - nom varchar(60), -- company name - note text, -- - remise real DEFAULT 0, -- remise systématique pour le client - fk_user_author integer - -)type=innodb; - diff --git a/mysql/tables/llx_groupesociete_remise.sql b/mysql/tables/llx_groupesociete_remise.sql deleted file mode 100644 index b8c40202f2f..00000000000 --- a/mysql/tables/llx_groupesociete_remise.sql +++ /dev/null @@ -1,34 +0,0 @@ --- ======================================================================== --- Copyright (C) 2000-2004 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$ --- --- Historique des remises au groupes de societes --- ======================================================================== - -create table llx_groupesociete_remise -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_groupe integer NOT NULL, - tms timestamp, - datec datetime, -- creation date - fk_user_author integer, -- utilisateur qui a créé l'info - remise real DEFAULT 0, -- remise systématique pour le client - note text - -)type=innodb; -