diff --git a/.gitmodules b/.gitmodules index d6ddf55d185..bde3aa966e6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "htdocs/custom/docgen"] path = htdocs/custom/docgen url = git+ssh://scm.doliforge.org/gitroot/docgen/docgen.git +[submodule "htdocs/custom/extrafields"] + path = htdocs/custom/extrafields + url = git+ssh://scm.doliforge.org/gitroot/extrafields/extrafields.git diff --git a/htdocs/custom/docgen b/htdocs/custom/docgen index 892f73e7c15..1e70700cab0 160000 --- a/htdocs/custom/docgen +++ b/htdocs/custom/docgen @@ -1 +1 @@ -Subproject commit 892f73e7c15223644bfa980fbedb14c31b2c4172 +Subproject commit 1e70700cab022c59641e3c0536e264df6227ae87 diff --git a/htdocs/custom/extrafields b/htdocs/custom/extrafields new file mode 160000 index 00000000000..e7373fbca4a --- /dev/null +++ b/htdocs/custom/extrafields @@ -0,0 +1 @@ +Subproject commit e7373fbca4a1fe67024ccdf53767cc7de41d9d7b diff --git a/htdocs/custom/productdiscount b/htdocs/custom/productdiscount index 70a47244b85..a6ae73bf87b 160000 --- a/htdocs/custom/productdiscount +++ b/htdocs/custom/productdiscount @@ -1 +1 @@ -Subproject commit 70a47244b851900e073b28243bd9e84090d53d82 +Subproject commit a6ae73bf87bc22cd0791ac99403d9da142f5b087 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..7c5c0575477 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 @@ -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;