Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_public_page_multientity_ticket

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;
 								}

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);

htdocs/install/mysql/tables/llx_online_signatures.sql

@@ -1,29 +0,0 @@
--- ============================================================================
--- Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
---
--- 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 <https://www.gnu.org/licenses/>.
--- ============================================================================
-
-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;

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;

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');