From ce1f220a520a3b0e3813ab8618ec89364a90862d Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 8 Aug 2011 22:27:00 +0000 Subject: [PATCH 1/4] Fix: move advanced extrafields in external module --- .../install/mysql/migration/3.0.0-3.1.0.sql | 8 +---- .../tables/llx_advanced_extrafields.key.sql | 21 ----------- .../mysql/tables/llx_advanced_extrafields.sql | 36 ------------------- .../llx_advanced_extrafields_options.key.sql | 23 ------------ .../llx_advanced_extrafields_options.sql | 29 --------------- .../llx_advanced_extrafields_values.key.sql | 23 ------------ .../llx_advanced_extrafields_values.sql | 35 ------------------ 7 files changed, 1 insertion(+), 174 deletions(-) delete mode 100755 htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql delete mode 100755 htdocs/install/mysql/tables/llx_advanced_extrafields.sql delete mode 100755 htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql delete mode 100755 htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql delete mode 100755 htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql delete mode 100755 htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql 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 3e4a44db5a9..aab279b907e 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 @@ -1,5 +1,5 @@ -- --- $Id: 3.0.0-3.1.0.sql,v 1.87 2011/08/08 16:13:28 hregis Exp $ +-- $Id: 3.0.0-3.1.0.sql,v 1.88 2011/08/08 22:27:01 hregis Exp $ -- -- Be carefull to requests order. -- This file must be loaded by calling /install/index.php page @@ -482,9 +482,3 @@ ALTER TABLE llx_don ADD phone_mobile varchar(24) after email; ALTER TABLE llx_don ADD phone varchar(24) after email; ALTER TABLE llx_user ADD civilite varchar(6) after entity; - -ALTER TABLE llx_advanced_extrafields_options DROP COLUMN tms; -ALTER TABLE llx_advanced_extrafields_options CHANGE COLUMN rang pos integer; -ALTER TABLE llx_advanced_extrafields CHANGE COLUMN rang pos integer; -ALTER TABLE llx_advanced_extrafields CHANGE COLUMN format type varchar(8) NOT NULL; -ALTER TABLE llx_advanced_extrafields CHANGE COLUMN fieldsize size integer; diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql deleted file mode 100755 index 18eed730ab8..00000000000 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql +++ /dev/null @@ -1,21 +0,0 @@ --- ============================================================================ --- Copyright (C) 2010 Regis Houssin --- --- 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, see . --- --- $Id: llx_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ --- ============================================================================ - - -ALTER TABLE llx_advanced_extrafields ADD UNIQUE INDEX idx_advanced_extrafields_name (elementtype, entity, name); diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql deleted file mode 100755 index 7dbf6b92416..00000000000 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ /dev/null @@ -1,36 +0,0 @@ --- =================================================================== --- Copyright (C) 2010-2011 Regis Houssin --- --- 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, see . --- --- $Id: llx_advanced_extrafields.sql,v 1.4 2011/08/08 16:13:29 hregis Exp $ --- =================================================================== - -create table llx_advanced_extrafields -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - tms timestamp, - entity integer DEFAULT 1 NOT NULL, -- multi company id - - elementtype varchar(64) NOT NULL, -- type of link 'invoice', 'order', 'proposal', 'invoice_supplier', 'order_supplier' - name varchar(64) NOT NULL, -- code name of field - label varchar(64) NOT NULL, - type varchar(8) NOT NULL, -- date, string, integer, float - size integer, - maxlength integer, - options varchar(255), - - pos integer - -)ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql deleted file mode 100755 index 62a88236480..00000000000 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql +++ /dev/null @@ -1,23 +0,0 @@ --- ============================================================================ --- Copyright (C) 2010 Regis Houssin --- --- 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, see . --- --- $Id: llx_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ --- ============================================================================ - - -ALTER TABLE llx_advanced_extrafields_options ADD INDEX idx_advanced_extrafields_options_fk_advanced_extrafields (fk_extrafields); - -ALTER TABLE llx_advanced_extrafields_options ADD CONSTRAINT fk_advanced_extrafields_options_fk_advanced_extrafields FOREIGN KEY (fk_extrafields) REFERENCES llx_advanced_extrafields (rowid); diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql deleted file mode 100755 index 83e830286e3..00000000000 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql +++ /dev/null @@ -1,29 +0,0 @@ --- =================================================================== --- Copyright (C) 2010-2011 Regis Houssin --- --- 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, see . --- --- $Id: llx_advanced_extrafields_options.sql,v 1.3 2011/08/08 16:07:33 hregis Exp $ --- =================================================================== - -create table llx_advanced_extrafields_options -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - - fk_extrafields integer NOT NULL, - value varchar(255) NOT NULL, - - pos integer - -)ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql deleted file mode 100755 index 296b49fc93f..00000000000 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql +++ /dev/null @@ -1,23 +0,0 @@ --- ============================================================================ --- Copyright (C) 2010 Regis Houssin --- --- 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, see . --- --- $Id: llx_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ --- ============================================================================ - - -ALTER TABLE llx_advanced_extrafields_values ADD INDEX idx_advanced_extrafields_values_fk_advanced_extrafields (fk_extrafields, entity); - -ALTER TABLE llx_advanced_extrafields_values ADD CONSTRAINT fk_advanced_extrafields_values_fk_advanced_extrafields FOREIGN KEY (fk_extrafields) REFERENCES llx_advanced_extrafields (rowid); diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql deleted file mode 100755 index 9cedf70e7ca..00000000000 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql +++ /dev/null @@ -1,35 +0,0 @@ --- =================================================================== --- Copyright (C) 2010 Regis Houssin --- --- 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, see . --- --- $Id: llx_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ --- =================================================================== - -create table llx_advanced_extrafields_values -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - tms timestamp, - entity integer DEFAULT 1 NOT NULL, -- multi company id - - datec datetime, - datem datetime, - fk_element integer NOT NULL, -- id of object (rowid of proposal, order, invoice...) - fk_extrafields integer NOT NULL, -- key to attribute definition - value varchar(255), -- value of attribute - - fk_user_create integer, - fk_user_modif integer - -)ENGINE=innodb; From f707eeacc4d9acd0b2b9cf8445202066259510dd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 23:16:45 +0000 Subject: [PATCH 2/4] Fix: Missing translation --- htdocs/langs/en_US/admin.lang | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 93d52d908bb..124d2d03757 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -648,7 +648,9 @@ DictionnaryPaperFormat=Paper formats DictionnaryFees=Type of fees DictionnarySendingMethods=Shipping methods DictionnaryStaff=Staff +DictionnaryAvailability=Delivery delay DictionnaryOrderMethods=Ordering methods +DictionnarySource=Origin of proposals/orders SetupSaved=Setup saved BackToModuleList=Back to modules list BackToDictionnaryList=Back to dictionaries list From d23fe6404d0f9bcad621daa6c76075a987242b11 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 23:24:30 +0000 Subject: [PATCH 3/4] Missing copyright --- htdocs/install/mysql/tables/llx_expedition.sql | 3 ++- htdocs/install/mysql/tables/llx_expeditiondet.sql | 3 ++- htdocs/install/mysql/tables/llx_export_compta.sql | 3 ++- htdocs/install/mysql/tables/llx_export_model.key.sql | 3 ++- htdocs/install/mysql/tables/llx_export_model.sql | 3 ++- htdocs/install/mysql/tables/llx_extrafields.key.sql | 3 ++- htdocs/install/mysql/tables/llx_extrafields.sql | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index 5e3620cba87..b80ae352680 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -1,6 +1,7 @@ -- =================================================================== -- Copyright (C) 2003-2010 Rodolphe Quiedeville -- Copyright (C) 2008-2010 Regis Houssin +-- Copyright (C) 2011 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 @@ -15,7 +16,7 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -- --- $Id: llx_expedition.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ +-- $Id: llx_expedition.sql,v 1.10 2011/08/08 23:24:31 eldy Exp $ -- =================================================================== create table llx_expedition diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index 1524eb7a77b..847c72b6ae3 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -1,6 +1,7 @@ -- =================================================================== -- Copyright (C) 2003 Rodolphe Quiedeville -- Copyright (C) 2008 Regis Houssin +-- Copyright (C) 2011 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 @@ -15,7 +16,7 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -- --- $Id: llx_expeditiondet.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ +-- $Id: llx_expeditiondet.sql,v 1.6 2011/08/08 23:24:30 eldy Exp $ -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql index 75a4ce8fd06..b7b7b6d0bd4 100644 --- a/htdocs/install/mysql/tables/llx_export_compta.sql +++ b/htdocs/install/mysql/tables/llx_export_compta.sql @@ -1,5 +1,6 @@ -- =================================================================== -- Copyright (C) 2004 Rodolphe Quiedeville +-- Copyright (C) 2011 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 @@ -14,7 +15,7 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -- --- $Id: llx_export_compta.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id: llx_export_compta.sql,v 1.4 2011/08/08 23:24:31 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index eafe6bd31e1..337374ee554 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -1,6 +1,7 @@ -- =================================================================== -- Copyright (C) 2007-2008 Laurent Destailleur -- Copyright (C) 2007 Regis Houssin +-- Copyright (C) 2011 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 @@ -15,7 +16,7 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -- --- $Id: llx_export_model.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ +-- $Id: llx_export_model.key.sql,v 1.3 2011/08/08 23:24:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql index 6a06c0c70b5..940f4b8d451 100644 --- a/htdocs/install/mysql/tables/llx_export_model.sql +++ b/htdocs/install/mysql/tables/llx_export_model.sql @@ -1,6 +1,7 @@ -- =================================================================== -- Copyright (C) 2001-2003 Rodolphe Quiedeville -- Copyright (C) 2007 Regis Houssin +-- Copyright (C) 2011 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 @@ -15,7 +16,7 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -- --- $Id: llx_export_model.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ +-- $Id: llx_export_model.sql,v 1.4 2011/08/08 23:24:31 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql index d4aa4b26d99..132649a4594 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.key.sql @@ -1,5 +1,6 @@ -- =================================================================== -- Copyright (C) 2009 Regis Houssin +-- Copyright (C) 2011 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 @@ -14,7 +15,7 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -- --- $Id: llx_extrafields.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ +-- $Id: llx_extrafields.key.sql,v 1.3 2011/08/08 23:24:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index b55d734674f..89aafb1d09f 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -2,6 +2,7 @@ -- Copyright (C) 2002-2003 Rodolphe Quiedeville -- Copyright (C) 2002-2003 Jean-Louis Bergamo -- Copyright (C) 2009 Regis Houssin +-- Copyright (C) 2011 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 @@ -16,7 +17,7 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -- --- $Id: llx_extrafields.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ +-- $Id: llx_extrafields.sql,v 1.3 2011/08/08 23:24:30 eldy Exp $ -- =================================================================== create table llx_extrafields From af15ea35084a90fe3cce77dd23d25d9f4376bdd9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 23:35:38 +0000 Subject: [PATCH 4/4] Add ignore --- dev/phpunit/.cvsignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 dev/phpunit/.cvsignore diff --git a/dev/phpunit/.cvsignore b/dev/phpunit/.cvsignore new file mode 100644 index 00000000000..085e8baf0c8 --- /dev/null +++ b/dev/phpunit/.cvsignore @@ -0,0 +1 @@ +Thumbs.db