diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 78f667adbe2..caa3914dd31 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -4,6 +4,7 @@ * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2005-2010 Regis Houssin * Copyright (C) 2010 Juanjo Menent + * Copyright (C) 2011 Philippe Grand * * 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 @@ -76,8 +77,7 @@ $tabname[18]= MAIN_DB_PREFIX."c_shipment_mode"; $tabname[19]= MAIN_DB_PREFIX."c_effectif"; $tabname[20]= MAIN_DB_PREFIX."c_input_method"; $tabname[21]= MAIN_DB_PREFIX."c_availability"; -$tabname[22]= MAIN_DB_PREFIX."c_source"; -//$tabname[23]= MAIN_DB_PREFIX."c_demand_reason"; +$tabname[22]= MAIN_DB_PREFIX."c_demand_reason"; // Dictionary labels $tablib[1] = "DictionnaryCompanyJuridicalType"; diff --git a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql index f4f0815301f..b92d1d386b9 100755 --- a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql +++ b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql @@ -11,6 +11,7 @@ -- RENAME TABLE llx_c_methode_commande_fournisseur TO llx_c_input_method; +RENAME TABLE llx_c_source TO llx_c_input_reason; ALTER TABLE llx_adherent MODIFY login varchar(50); @@ -77,13 +78,13 @@ INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (2, 'AV_1W', '1 INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (3, 'AV_2W', '2 weeks', 1); INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (4, 'AV_3W', '3 weeks', 1); -INSERT INTO llx_c_source (rowid,code,label,active) VALUES (1, 'SRC_00', 'Proposition commerciale', 1); -INSERT INTO llx_c_source (rowid,code,label,active) VALUES (2, 'SRC_01', 'Internet', 1); -INSERT INTO llx_c_source (rowid,code,label,active) VALUES (3, 'SRC_02', 'Campagne courrier', 1); -INSERT INTO llx_c_source (rowid,code,label,active) VALUES (4, 'SRC_03', 'Campagne téléphone', 1); -INSERT INTO llx_c_source (rowid,code,label,active) VALUES (5, 'SRC_04', 'Campagne fax', 1); -INSERT INTO llx_c_source (rowid,code,label,active) VALUES (6, 'SRC_05', 'Commercial', 1); -INSERT INTO llx_c_source (rowid,code,label,active) VALUES (7, 'SRC_06', 'Magasin', 1); +INSERT INTO llx_c_input_reason (rowid,code,label,active) VALUES (1, 'SRC_00', 'Proposition commerciale', 1); +INSERT INTO llx_c_input_reason (rowid,code,label,active) VALUES (2, 'SRC_01', 'Internet', 1); +INSERT INTO llx_c_input_reason (rowid,code,label,active) VALUES (3, 'SRC_02', 'Campagne courrier', 1); +INSERT INTO llx_c_input_reason (rowid,code,label,active) VALUES (4, 'SRC_03', 'Campagne téléphone', 1); +INSERT INTO llx_c_input_reason (rowid,code,label,active) VALUES (5, 'SRC_04', 'Campagne fax', 1); +INSERT INTO llx_c_input_reason (rowid,code,label,active) VALUES (6, 'SRC_05', 'Commercial', 1); +INSERT INTO llx_c_input_reason (rowid,code,label,active) VALUES (7, 'SRC_06', 'Magasin', 1); ALTER TABLE llx_actioncomm ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER id;