diff --git a/ChangeLog b/ChangeLog index d82ec25f393..57d217f8a38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,9 @@ English Dolibarr ChangeLog -------------------------------------------------------------- -WARNING: Do not try to make any Dolibarr upgrade if you are running Mysql version 5.5.40. +WARNING: + +Do not try to make any Dolibarr upgrade if you are running Mysql version 5.5.40. Mysql version 5.5.40 has a very critical bug making your data beeing definitely lost. You may also experience troubles with Mysql 5.5.41 with error "Lost connection" during migration. Upgrading to any other version or any other database system is abolutely required BEFORE trying @@ -11,7 +13,9 @@ make a Dolibarr upgrade. ***** ChangeLog for 3.9 compared to 3.8.* ***** -WARNING: Following changes may create regression for some external modules, but were necessary to make +WARNING: + +Following changes may create regression for some external modules, but were necessary to make Dolibarr better: - Deprecated hidden option MAIN_USE_CUSTOM_TRANSLATION has been removed. Use table llx_overwrite_trans instead. - Trigger LINECONTRACT_INSERT has been renamed into LINECONTRACT_CREATE to match common denomination. @@ -348,9 +352,11 @@ FIX send mail, copy sendto don't read the list of contact FIX Properly escape untrusted data to prevent HTML injection. FIX send mail, copy sendto don't read the list of contact -Path to save photos of products was moved in 3.7.0 to match path of other attached files. If you had loose -your photo on the photo tab of products, you can set the constant "PRODUCT_USE_OLD_PATH_FOR_PHOTO" to -restore old path. +WARNING: + +Path to save photos of products was moved to match path of other attached files. If you had loose your photo +on the photo tab of products, you can set the constant "PRODUCT_USE_OLD_PATH_FOR_PHOTO" to 1 (home - setup - other) +to restore old path and get back working links without having to resubmit images. WARNING: @@ -523,11 +529,14 @@ You may also experience troubles with Mysql 5.5.41 with error "Lost connection" Upgrading to any other version or database system is abolutely required BEFORE trying to make a Dolibarr upgrade. -WARNING: Following changes may create regression for some external modules, but was necessary to make +WARNING: + +Following changes may create regression for some external modules, but was necessary to make Dolibarr better: - Path to save photos of products was moved to match path of other attached files. If you had loose your photo - on the photo tab of products, you can set the constant "PRODUCT_USE_OLD_PATH_FOR_PHOTO" to restore old path. + on the photo tab of products, you can set the constant "PRODUCT_USE_OLD_PATH_FOR_PHOTO" to 1 (home - setup - other) + to restore old path and get back working links without having to resubmit images. - If you can't see trips and expenses records, check that you have the new permission "read all trips and expenses". - Deprecated module "oscommerce" were removed. diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql index 1d8c12e3938..4942378e58c 100755 --- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql +++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql @@ -68,3 +68,27 @@ ALTER TABLE llx_societe_rib MODIFY COLUMN code_banque varchar(128); ALTER TABLE llx_contrat ADD COLUMN ref_customer varchar(30); + +ALTER TABLE llx_ecm_directories MODIFY COLUMN fullpath varchar(10000); + +CREATE TABLE llx_ecm_files +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + label varchar(64) NOT NULL, + entity integer DEFAULT 1 NOT NULL, -- multi company id + filename varchar(255) NOT NULL, -- file name only without any directory + fullpath varchar(10000) NOT NULL, -- relative to dolibarr document dir. example abc/def/myfile + fullpath_orig varchar(10000), -- full path of original filename, when file is uploaded from a local computer + description text, + keywords text, -- list of keywords, separated with comma + cover text, -- is this file a file to use for a cover + extraparams varchar(255), -- for stock other parameters with json format + date_c datetime, + date_m timestamp, + fk_user_c integer, + fk_user_m integer, + acl text -- for future permission 'per file' +) ENGINE=innodb; + +ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files_fullpath(fullpath); + diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql index d214737ff08..22f77608029 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql @@ -17,9 +17,9 @@ -- -- =================================================================== --- drop table llx_ecm_directories; +-- DROP TABLE llx_ecm_directories; -create table llx_ecm_directories +CREATE TABLE llx_ecm_directories ( rowid integer AUTO_INCREMENT PRIMARY KEY, label varchar(64) NOT NULL, @@ -27,12 +27,11 @@ create table llx_ecm_directories fk_parent integer, description varchar(255) NOT NULL, cachenbofdoc integer NOT NULL DEFAULT 0, - fullpath varchar(255), + fullpath varchar(10000), extraparams varchar(255), -- for stock other parameters with json format date_c datetime, date_m timestamp, fk_user_c integer, fk_user_m integer, acl text - ) ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_ecm_files.key.sql b/htdocs/install/mysql/tables/llx_ecm_files.key.sql new file mode 100644 index 00000000000..b689bf0b0fb --- /dev/null +++ b/htdocs/install/mysql/tables/llx_ecm_files.key.sql @@ -0,0 +1,20 @@ +-- ============================================================================ +-- Copyright (C) 2015 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 3 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 . +-- +-- ============================================================================ + + +ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files_fullpath(fullpath); diff --git a/htdocs/install/mysql/tables/llx_ecm_files.sql b/htdocs/install/mysql/tables/llx_ecm_files.sql new file mode 100644 index 00000000000..1c4451d939a --- /dev/null +++ b/htdocs/install/mysql/tables/llx_ecm_files.sql @@ -0,0 +1,36 @@ +-- =================================================================== +-- Copyright (C) 2015 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 3 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 . +-- +-- =================================================================== + +CREATE TABLE llx_ecm_files +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + label varchar(64) NOT NULL, + entity integer DEFAULT 1 NOT NULL, -- multi company id + filename varchar(255) NOT NULL, -- file name only without any directory + fullpath varchar(10000) NOT NULL, -- relative to dolibarr document dir. example abc/def/myfile + fullpath_orig varchar(10000), -- full path of original filename, when file is uploaded from a local computer + description text, + keywords text, -- list of keywords, separated with comma + cover text, -- is this file a file to use for a cover + extraparams varchar(255), -- for stock other parameters with json format + date_c datetime, + date_m timestamp, + fk_user_c integer, + fk_user_m integer, + acl text -- for future permission 'per file' +) ENGINE=innodb; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 0f267bd0520..6f720c0a92b 100755 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1618,7 +1618,7 @@ TaskModelModule=Tasks reports document model UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box) ##### ECM (GED) ##### ECMSetup = GED Setup -ECMAutoTree = Automatic tree folder and document +ECMAutoTree = Show also the automatic tree folder and document ##### Fiscal Year ##### FiscalYears=Fiscal years FiscalYear=Fiscal year