From 517355972aa052d0633338862925eb94a0bf618a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 16 Dec 2021 19:01:11 +0100 Subject: [PATCH 1/3] Fix duplicate table for online signature --- htdocs/core/class/commonobject.class.php | 2 +- .../mysql/tables/llx_online_signatures.sql | 29 ------------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 htdocs/install/mysql/tables/llx_online_signatures.sql diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index a83cfae3000..94bea1e56b4 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -5308,7 +5308,7 @@ abstract class CommonObject // Set the public "share" key $setsharekey = false; if ($this->element == 'propal') { - $useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok + $useonlinesignature = 1; // Replace this with 1 when feature to make online signature is ok if ($useonlinesignature) { $setsharekey = true; } diff --git a/htdocs/install/mysql/tables/llx_online_signatures.sql b/htdocs/install/mysql/tables/llx_online_signatures.sql deleted file mode 100644 index fbba814dd4d..00000000000 --- a/htdocs/install/mysql/tables/llx_online_signatures.sql +++ /dev/null @@ -1,29 +0,0 @@ --- ============================================================================ --- Copyright (C) 2017 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_onlinesignature -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - entity integer DEFAULT 1 NOT NULL, - object_type varchar(32) NOT NULL, - object_id integer NOT NULL, - datec datetime NOT NULL, - tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - name varchar(255) NOT NULL, - ip varchar(128), - pathoffile varchar(255) -)ENGINE=innodb; From fcb10df5704cec71b64f857a26593b0a1e2199d7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 17 Dec 2021 09:54:03 +0100 Subject: [PATCH 2/3] Fix size of origintype --- htdocs/install/mysql/migration/14.0.0-15.0.0.sql | 1 + htdocs/install/mysql/tables/llx_stock_mouvement.sql | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql index 263e94e4575..cd24a252a04 100644 --- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql +++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql @@ -479,3 +479,4 @@ ALTER TABLE llx_session MODIFY COLUMN user_agent VARCHAR(255) NULL; ALTER TABLE llx_inventorydet ADD COLUMN fk_movement integer NULL; +ALTER TABLE llx_stock_mouvement MODIFY COLUMN origintype varchar(64); diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index 2cd094c1b05..ec3465a6c2d 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -35,7 +35,7 @@ create table llx_stock_mouvement inventorycode varchar(128), -- Code used to group different movement line into one operation (may be an inventory, a mass picking) fk_project integer, fk_origin integer, - origintype varchar(32), + origintype varchar(64), model_pdf varchar(255), fk_projet integer NOT NULL DEFAULT 0 )ENGINE=innodb; From e60f65db7d417ae8a96fffb50ff2e06c003d6fda Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 17 Dec 2021 10:00:10 +0100 Subject: [PATCH 3/3] Trans --- htdocs/product/popuprop.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index 32a2cd08cc9..dbffe79d0c0 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -30,7 +30,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; // Load translation files required by the page -$langs->loadLangs(array('commande', 'propal', 'bills', 'other')); +$langs->loadLangs(array('commande', 'propal', 'bills', 'other', 'products')); $backtopage = GETPOST('backtopage', 'alpha'); $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');