From 95417d4c86129b1a55283d097ebece7857b87265 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Tue, 10 Sep 2019 16:24:04 +0200
Subject: [PATCH 01/48] allow standalone credit note even if no invoice

---
 htdocs/compta/facture/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index d81467d64e4..3d363b60bb2 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3047,7 +3047,7 @@ if ($action == 'create')
 			{
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 				$tmp='<input type="radio" id="radio_creditnote" name="type" value="2"' . (GETPOST('type') == 2 ? ' checked' : '');
-				if (! $optionsav) $tmp.=' disabled';
+				if ( ! $optionsav && ! empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE) ) $tmp.=' disabled';
 				$tmp.= '> ';
 				// Show credit note options only if we checked credit note
 				print '<script type="text/javascript" language="javascript">

From c8cb5886f4c17ab01a1672557fa232bb3a64b1a2 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Tue, 10 Sep 2019 17:04:09 +0200
Subject: [PATCH 02/48] correction

---
 htdocs/compta/facture/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 3d363b60bb2..ee43cbf6a19 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3047,7 +3047,7 @@ if ($action == 'create')
 			{
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 				$tmp='<input type="radio" id="radio_creditnote" name="type" value="2"' . (GETPOST('type') == 2 ? ' checked' : '');
-				if ( ! $optionsav && ! empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE) ) $tmp.=' disabled';
+				if ( ! $optionsav && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE) ) $tmp.=' disabled';
 				$tmp.= '> ';
 				// Show credit note options only if we checked credit note
 				print '<script type="text/javascript" language="javascript">

From ea1baefe9a5edab606f20588169943860c954e95 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 15 Sep 2019 20:50:18 +0200
Subject: [PATCH 03/48] NEW: delete purchase price API

---
 htdocs/product/class/api_products.class.php | 35 +++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 756bbde5b29..ad8170921ae 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -467,6 +467,41 @@ class Products extends DolibarrApi
         );
     }
 
+    /**
+     * Delete purchase price for a product
+     *
+     * @param  int $id Product ID
+     * @param  int $priceid purchase price ID
+     *
+     * @url DELETE {id}/purchase_prices/{priceid}
+     *
+     * @return array
+     *
+     * @throws 401
+     * @throws 404
+     *
+     */
+    public function deletePurchasePrice($id, $priceid)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->supprimer) {
+            throw new RestException(401);
+        }
+        $result = $this->product->fetch($id);
+        if(! $result ) {
+            throw new RestException(404, 'Product not found');
+        }
+
+        if(! DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        if($result) {
+        $this->product = new ProductFournisseur($this->db);
+        $this->product->fetch($id);
+        }
+
+        return $this->product->remove_product_fournisseur_price($priceid);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**

From 2ac8bd4e1629f27e5f5c745ade6db6f0b3933fd3 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Tue, 17 Sep 2019 11:59:58 +0200
Subject: [PATCH 04/48] FIX : If we share invoice, we need to see discount
 created from a deposit on each entity

---
 htdocs/core/class/discount.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 2e99a83ec42..d464e986c32 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -91,7 +91,7 @@ class DiscountAbsolute
         $sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as sr";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON sr.fk_facture_source = f.rowid";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fsup ON sr.fk_invoice_supplier_source = fsup.rowid";
-        $sql.= " WHERE sr.entity = " . $conf->entity;
+	$sql.= " WHERE sr.entity IN (".getEntity('invoice').")";
         if ($rowid) $sql.= " AND sr.rowid=".$rowid;
         if ($fk_facture_source) $sql.= " AND sr.fk_facture_source=".$fk_facture_source;
         if ($fk_invoice_supplier_source) $sql.= " AND sr.fk_invoice_supplier_source=".$fk_invoice_supplier_source;

From d40534e8fadf0a11034010bb27b53b8b70290294 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Thu, 19 Sep 2019 15:21:52 +0200
Subject: [PATCH 05/48] FIX : change product type must be allowed if we
 activate hidden conf

---
 htdocs/product/card.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 1e6995fff35..f03a6db0e17 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1597,7 +1597,9 @@ else
 			{
 				// TODO change for compatibility with edit in place
 				$typeformat='select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
-				print '<tr><td class="titlefield">'.$form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat).'</td><td colspan="2">';
+				print '<tr><td class="titlefield">';
+				print (!empty($conf->global->MAIN_ALLOW_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
+				print '</td><td colspan="2">';
 				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat);
 				print '</td></tr>';
 			}

From 4b3430a1dc5109ed0dd8c422d9721e2c0847ef5a Mon Sep 17 00:00:00 2001
From: madx666 <ludovic.canivet@gmail.com>
Date: Mon, 16 Sep 2019 15:39:58 +0200
Subject: [PATCH 06/48] Fix return to list on page 1

When are on page 1 on any list and we go on an object, when return to the list, we are back on page 0
---
 htdocs/main.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index fcd2d8d7e54..5fbc453583b 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -774,7 +774,7 @@ if (! defined('NOLOGIN'))
 			    	$_SESSION['lastsearch_contextpage_'.$relativepathstring]=$_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring];
 			    	unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
 			    }
-			    if (! empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 1)
+			    if (! empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 0)
 			    {
 			    	$_SESSION['lastsearch_page_'.$relativepathstring]=$_SESSION['lastsearch_page_tmp_'.$relativepathstring];
 			    	unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
@@ -2249,7 +2249,7 @@ if (! function_exists("llxFooter"))
 			unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
 
 			if (! empty($contextpage))                     $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]=$contextpage;
-			if (! empty($page) && $page > 1)               $_SESSION['lastsearch_page_tmp_'.$relativepathstring]=$page;
+			if (! empty($page) && $page > 0)               $_SESSION['lastsearch_page_tmp_'.$relativepathstring]=$page;
 			if (! empty($limit) && $limit != $conf->limit) $_SESSION['lastsearch_limit_tmp_'.$relativepathstring]=$limit;
 
 			unset($_SESSION['lastsearch_contextpage_'.$relativepathstring]);

From e3edb376209af4646fde5d05b654254936b831e9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 27 Sep 2019 11:39:02 +0200
Subject: [PATCH 07/48] Fix escape db

---
 htdocs/resource/class/dolresource.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 2f45be04542..13cbf37c34a 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -849,7 +849,7 @@ class Dolresource extends CommonObject
 	    $sql.= ' FROM '.MAIN_DB_PREFIX.'element_resources';
 	    $sql.= " WHERE element_id=".$element_id." AND element_type='".$this->db->escape($element)."'";
 	    if($resource_type)
-	    	$sql.=" AND resource_type LIKE '%".$resource_type."%'";
+	    	$sql.=" AND resource_type LIKE '%".$this->db->escape($resource_type)."%'";
 	    $sql .= ' ORDER BY resource_type';
 
 	    dol_syslog(get_class($this)."::getElementResources", LOG_DEBUG);

From 5f08a649ebdaae8c3ff5f09f4acab81e0a49a6e6 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Mon, 16 Sep 2019 10:37:55 +0200
Subject: [PATCH 08/48] FIX empty cache when we want to load specific
 warehouses in select

Conflicts:
	htdocs/product/class/html.formproduct.class.php
---
 htdocs/product/class/html.formproduct.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index a0ebda88cd9..4f388798074 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -218,6 +218,7 @@ class FormProduct
 
 		$out='';
 		if (empty($conf->global->ENTREPOT_EXTRA_STATUS)) $filterstatus = '';
+        if (!empty($fk_product))  $this->cache_warehouses = array();
 		$this->loadWarehouses($fk_product, '', $filterstatus, true, $exclude);
 		$nbofwarehouses=count($this->cache_warehouses);
 

From 46e019642f019e1cee2cfb64fddf8fae076c11ea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 27 Sep 2019 17:51:22 +0200
Subject: [PATCH 09/48] Code comment

---
 htdocs/core/class/commonobject.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index c49515fa63b..23383e3dfe7 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3687,7 +3687,7 @@ abstract class CommonObject
 			if (empty($totalVolume)) $totalVolume=0;  // Avoid warning because $totalVolume is ''
 
 			//var_dump($line->volume_units);
-			if ($weight_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
+			if ($weight_units < 50)   // < 50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
 			{
 				$trueWeightUnit=pow(10, $weightUnit);
 				$totalWeight += $weight * $qty * $trueWeightUnit;

From d0d884742f64dab255008ea811a32d5e6802c25e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 27 Sep 2019 19:45:33 +0200
Subject: [PATCH 10/48] FIX #11861 Not consistent code to manage measuring
 units

---
 htdocs/core/class/cunits.class.php            |  2 +
 htdocs/core/lib/functions.lib.php             |  4 +-
 htdocs/core/lib/product.lib.php               | 26 ++++++++--
 htdocs/core/modules/modProduct.class.php      | 15 +++---
 .../install/mysql/migration/9.0.0-10.0.0.sql  | 12 ++---
 htdocs/product/card.php                       | 47 ++++++++++---------
 .../product/class/html.formproduct.class.php  |  6 ++-
 7 files changed, 67 insertions(+), 45 deletions(-)

diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index 861d7f737bb..501192a68eb 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -235,6 +235,7 @@ class CUnits // extends CommonObject
     	$sql.= " t.label,";
     	$sql.= " t.short_label,";
     	$sql.= " t.unit_type,";
+    	$sql.= " t.scale,";
     	$sql.= " t.active";
     	$sql .= ' FROM ' . MAIN_DB_PREFIX . 'c_units as t';
     	// Manage filter
@@ -279,6 +280,7 @@ class CUnits // extends CommonObject
 	    			$record->label = $obj->label;
 	    			$record->short_label = $obj->short_label;
 	    			$record->unit_type = $obj->unit_type;
+	    			$record->scale = $obj->scale;
 	    			$record->active = $obj->active;
 	    			$this->records[$record->id] = $record;
 	    		}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 97743d5e264..2af7dcd1b9e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4522,7 +4522,7 @@ function price2num($amount, $rounding = '', $alreadysqlnb = 0)
  * Output a dimension with best unit
  *
  * @param   float       $dimension      Dimension
- * @param   int         $unit           Unit of dimension (Example: 0=kg, -3=g, 98=ounce, 99=pound, ...)
+ * @param   int         $unit           Unit scale of dimension (Example: 0=kg, -3=g, -6=mg, 98=ounce, 99=pound, ...)
  * @param   string      $type           'weight', 'volume', ...
  * @param   Translate   $outputlangs    Translate language object
  * @param   int         $round          -1 = non rounding, x = number of decimal
@@ -4566,7 +4566,7 @@ function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round
 	    $unit = $forceunitoutput;
 	}*/
 
-	$ret=price($dimension, 0, $outputlangs, 0, 0, $round).' '.measuring_units_string($unit, $type);
+	$ret=price($dimension, 0, $outputlangs, 0, 0, $round).' '.measuring_units_string(0, $type, $unit);
 
 	return $ret;
 }
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 4d79d0d4db3..0673ad2c3c7 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -127,7 +127,7 @@ function product_prepare_head($object)
             $h++;
         }
     }
-    
+
     // Tab to link resources
     if (!empty($conf->resource->enabled))
     {
@@ -485,25 +485,41 @@ function show_stats_for_company($product, $socid)
  *
  *	@param	int		$unit                ID of unit (rowid in llx_c_units table)
  *	@param  string	$measuring_style     Style of unit: weight, volume,...
+ *  @param	string  $scale				 Scale of unit: '0', '-3', '6', ...
+ *  @param	int		$use_short_label	 1=Use short label ('g' instead of 'gram'). Short labels are not translated.
  *	@return	string	   			         Unit string
  * 	@see	formproduct->selectMeasuringUnits
  */
-function measuring_units_string($unit, $measuring_style = '')
+function measuring_units_string($unit, $measuring_style = '', $scale = '', $use_short_label = 0)
 {
 	global $langs, $db;
 	require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
 	$measuringUnits= new CUnits($db);
-	$result = $measuringUnits->fetchAll('', '', 0, 0, array(
+
+	if ($scale !== '')
+	{
+		$arrayforfilter = array(
+			't.scale' => $scale,
+			't.unit_type' => $measuring_style,
+			't.active' => 1
+		);
+	}
+	else
+	{
+		$arrayforfilter = array(
 			't.rowid' => $unit,
 			't.unit_type' => $measuring_style,
 			't.active' => 1
-	));
+		);
+	}
+	$result = $measuringUnits->fetchAll('', '', 0, 0, $arrayforfilter);
 
 	if ($result<0) {
 		return -1;
 	} else {
 		if (is_array($measuringUnits->records) && count($measuringUnits->records)>0) {
-			return $langs->transnoentitiesnoconv($measuringUnits->records[key($measuringUnits->records)]->label);
+			if ($use_short_label) return $measuringUnits->records[key($measuringUnits->records)]->short_label;
+			else return $langs->transnoentitiesnoconv($measuringUnits->records[key($measuringUnits->records)]->label);
 		} else {
 			return '';
 		}
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index d425b07d01a..9592e3b185f 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -392,6 +392,7 @@ class modProduct extends DolibarrModules
             ));
         }
 
+        /* Disabled: The value of fields xxx_units is the scale for reference unit, not the rowid in table llx_c_unit !!!
         $this->import_convertvalue_array[$r] = array(
 				'p.weight_units' => array(
 						'rule' => 'fetchidfromcodeunits',
@@ -441,7 +442,7 @@ class modProduct extends DolibarrModules
 						'units' => 'volume',
 						'dict' => 'DictionaryMeasuringUnits'
 				)
-		);
+		);*/
 
 		if (! empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r], array('p.cost_price'=>'CostPrice'));
 		if (is_object($mysoc) && $mysoc->useNPR()) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r], array('p.recuperableonly'=>'NPR'));
@@ -501,17 +502,17 @@ class modProduct extends DolibarrModules
             'p.accountancy_code_sell_export' => "",
             'p.accountancy_code_buy' => "",
             'p.weight' => "",
-			'p.weight_units' => 'use a unit of measure from the dictionary. g/Kg/T etc....matches field "Short Label" for unit type "weight" in table "' . MAIN_DB_PREFIX . 'c_units',
+			'p.weight_units' => 'use a unit of measure from the dictionary. g/Kg/T etc....matches field "Scale" for unit type "weight" in table "' . MAIN_DB_PREFIX . 'c_units',
             'p.length' => "",
-			'p.length_units' => 'use a unit of measure from the dictionary. m/cm/mm etc....matches field "Short Label" for unit type "size" in table "' . MAIN_DB_PREFIX . 'c_units',
+			'p.length_units' => 'use a unit of measure from the dictionary. m/cm/mm etc....matches field "Scale" for unit type "size" in table "' . MAIN_DB_PREFIX . 'c_units',
             'p.width' => "",
-			'p.width_units' => 'use a unit of measure from the dictionary. m/cm/mm etc....matches field "Short Label" for unit type "size" in table "' . MAIN_DB_PREFIX . 'c_units',
+			'p.width_units' => 'use a unit of measure from the dictionary. m/cm/mm etc....matches field "Scale" for unit type "size" in table "' . MAIN_DB_PREFIX . 'c_units',
             'p.height' => "",
-			'p.height_units' => 'use a unit of measure from the dictionary. m/cm/mm etc....matches field "Short Label" for unit type "size" in table "' . MAIN_DB_PREFIX . 'c_units',
+			'p.height_units' => 'use a unit of measure from the dictionary. m/cm/mm etc....matches field "Scale" for unit type "size" in table "' . MAIN_DB_PREFIX . 'c_units',
             'p.surface' => "",
-			'p.surface_units' => 'use a unit of measure from the dictionary. m2/cm2/mm2 etc....matches field "Short Label" for unit type "surface" in table "' . MAIN_DB_PREFIX . 'c_units',
+			'p.surface_units' => 'use a unit of measure from the dictionary. m2/cm2/mm2 etc....matches field "Scale" for unit type "surface" in table "' . MAIN_DB_PREFIX . 'c_units',
             'p.volume' => "",
-			'p.volume_units' => 'use a unit of measure from the dictionary. m3/cm3/mm3 etc....matches field "Short Label" for unit type "volume" in table "' . MAIN_DB_PREFIX . 'c_units',
+			'p.volume_units' => 'use a unit of measure from the dictionary. m3/cm3/mm3 etc....matches field "Scale" for unit type "volume" in table "' . MAIN_DB_PREFIX . 'c_units',
             'p.finished' => '0 (raw material) / 1 (finished goods)'
         );
         //clauses copied from import_fields_array
diff --git a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
index ac98c8adbc4..e9130c5d5c4 100644
--- a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
+++ b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
@@ -178,14 +178,14 @@ INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VAL
 INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('Y','31557600','year','y', 'time', 1);
 
 UPDATE llx_c_units SET short_label = 'i' WHERE code = 'MI';
-UPDATE llx_c_units SET unit_type = 'weight', short_label = 'kg' WHERE code = 'KG';
-UPDATE llx_c_units SET unit_type = 'weight', short_label = 'g' WHERE code = 'G';
+UPDATE llx_c_units SET unit_type = 'weight', short_label = 'kg', scale = 0 WHERE code = 'KG';
+UPDATE llx_c_units SET unit_type = 'weight', short_label = 'g', scale = -3 WHERE code = 'G';
 UPDATE llx_c_units SET unit_type = 'time' WHERE code IN ('S','H','D');
 UPDATE llx_c_units SET unit_type = 'size' WHERE code IN ('M','LM');
-UPDATE llx_c_units SET label = 'SizeUnitm' WHERE code IN ('M');
-UPDATE llx_c_units SET active = 0 WHERE code IN ('LM');
-UPDATE llx_c_units SET unit_type = 'surface' WHERE code IN ('M2');
-UPDATE llx_c_units SET unit_type = 'volume' WHERE code IN ('M3','L');
+UPDATE llx_c_units SET label = 'SizeUnitm', scale = 0 WHERE code IN ('M');
+UPDATE llx_c_units SET active = 0, scale = 0 WHERE code IN ('LM');
+UPDATE llx_c_units SET unit_type = 'surface', scale = 0 WHERE code IN ('M2');
+UPDATE llx_c_units SET unit_type = 'volume', scale = 0 WHERE code IN ('M3','L');
 UPDATE llx_c_units SET scale = -3, active = 0 WHERE code IN ('L');
 UPDATE llx_c_units SET label = 'VolumeUnitm3' WHERE code IN ('M3');
 UPDATE llx_c_units SET label = 'SurfaceUnitm2' WHERE code IN ('M2');
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index ca3cec982df..f5e67dec70d 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -300,17 +300,17 @@ if (empty($reshook))
             $object->desiredstock            = GETPOST('desiredstock')?GETPOST('desiredstock'):0;
             $object->canvas             	 = GETPOST('canvas');
             $object->weight             	 = GETPOST('weight');
-            $object->weight_units       	 = GETPOST('weight_units');
+            $object->weight_units       	 = GETPOST('weight_units');		// This is not the fk_unit but the power of unit
             $object->length             	 = GETPOST('size');
-            $object->length_units       	 = GETPOST('size_units');
+            $object->length_units       	 = GETPOST('size_units');		// This is not the fk_unit but the power of unit
             $object->width               	 = GETPOST('sizewidth');
             $object->height             	 = GETPOST('sizeheight');
 	        $object->surface            	 = GETPOST('surface');
-            $object->surface_units      	 = GETPOST('surface_units');
+	        $object->surface_units      	 = GETPOST('surface_units');	// This is not the fk_unit but the power of unit
             $object->volume             	 = GETPOST('volume');
-            $object->volume_units       	 = GETPOST('volume_units');
+            $object->volume_units       	 = GETPOST('volume_units');		// This is not the fk_unit but the power of unit
             $object->finished           	 = GETPOST('finished', 'alpha');
-            $object->fk_unit                 = GETPOST('units', 'alpha');
+            $object->fk_unit                 = GETPOST('units', 'alpha');	// This is the fk_unit of sale
 
 	        $accountancy_code_sell 			 = GETPOST('accountancy_code_sell', 'alpha');
 	        $accountancy_code_sell_intra	 = GETPOST('accountancy_code_sell_intra', 'alpha');
@@ -404,16 +404,16 @@ if (empty($reshook))
 
                 $object->canvas                 = GETPOST('canvas');
                 $object->weight                 = GETPOST('weight');
-                $object->weight_units           = GETPOST('weight_units');
+                $object->weight_units           = GETPOST('weight_units');	// This is not the fk_unit but the power of unit
                 $object->length                 = GETPOST('size');
-                $object->length_units           = GETPOST('size_units');
-                $object->width               	 = GETPOST('sizewidth');
-                $object->height             	 = GETPOST('sizeheight');
+                $object->length_units           = GETPOST('size_units');	// This is not the fk_unit but the power of unit
+                $object->width               	= GETPOST('sizewidth');
+                $object->height             	= GETPOST('sizeheight');
 
                 $object->surface                = GETPOST('surface');
-                $object->surface_units          = GETPOST('surface_units');
+                $object->surface_units          = GETPOST('surface_units');	// This is not the fk_unit but the power of unit
                 $object->volume                 = GETPOST('volume');
-                $object->volume_units           = GETPOST('volume_units');
+                $object->volume_units           = GETPOST('volume_units');	// This is not the fk_unit but the power of unit
                 $object->finished               = GETPOST('finished', 'alpha');
 
 	            $units = GETPOST('units', 'int');
@@ -1044,7 +1044,7 @@ else
             // Weight
             print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
             print '<input name="weight" size="4" value="'.GETPOST('weight').'">';
-            print $formproduct->selectMeasuringUnits("weight_units", "weight", (empty($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?0:$conf->global->MAIN_WEIGHT_DEFAULT_UNIT));
+            print $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOSTISSET('weight_units')?GETPOST('weight_units', 'alpha'):(empty($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?0:$conf->global->MAIN_WEIGHT_DEFAULT_UNIT), 0, 2);
             print '</td></tr>';
             // Length
             if (empty($conf->global->PRODUCT_DISABLE_SIZE))
@@ -1053,7 +1053,7 @@ else
                 print '<input name="size" size="4" value="'.GETPOST('size').'"> x ';
                 print '<input name="sizewidth" size="4" value="'.GETPOST('sizewidth').'"> x ';
                 print '<input name="sizeheight" size="4" value="'.GETPOST('sizeheight').'">';
-                print $formproduct->selectMeasuringUnits("size_units", "size");
+                print $formproduct->selectMeasuringUnits("size_units", "size", GETPOSTISSET('size_units')?GETPOST('size_units', 'alpha'):'0', 0, 2);
                 print '</td></tr>';
             }
             if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
@@ -1061,7 +1061,7 @@ else
                 // Surface
                 print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
                 print '<input name="surface" size="4" value="'.GETPOST('surface').'">';
-                print $formproduct->selectMeasuringUnits("surface_units", "surface");
+                print $formproduct->selectMeasuringUnits("surface_units", "surface", GETPOSTISSET('surface_units')?GETPOST('surface_units', 'alpha'):'0', 0, 2);
                 print '</td></tr>';
             }
             if (empty($conf->global->PRODUCT_DISABLE_VOLUME))
@@ -1069,7 +1069,7 @@ else
                 // Volume
                 print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
                 print '<input name="volume" size="4" value="'.GETPOST('volume').'">';
-                print $formproduct->selectMeasuringUnits("volume_units", "volume");
+                print $formproduct->selectMeasuringUnits("volume_units", "volume", GETPOSTISSET('volume_units')?GETPOST('volume_units', 'alpha'):'0', 0, 2);
                 print '</td></tr>';
             }
         }
@@ -1417,7 +1417,7 @@ else
                 // Weight
                 print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
                 print '<input name="weight" size="5" value="'.$object->weight.'"> ';
-                print $formproduct->selectMeasuringUnits("weight_units", "weight", $object->weight_units);
+                print $formproduct->selectMeasuringUnits("weight_units", "weight", $object->weight_units, 0, 2);
                 print '</td></tr>';
                 if (empty($conf->global->PRODUCT_DISABLE_SIZE))
                 {
@@ -1426,7 +1426,7 @@ else
                   print '<input name="size" size="5" value="'.$object->length.'">x';
                   print '<input name="sizewidth" size="5" value="'.$object->width.'">x';
                   print '<input name="sizeheight" size="5" value="'.$object->height.'"> ';
-                  print $formproduct->selectMeasuringUnits("size_units", "size", $object->length_units);
+                  print $formproduct->selectMeasuringUnits("size_units", "size", $object->length_units, 0, 2);
                   print '</td></tr>';
                 }
                 if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
@@ -1434,7 +1434,7 @@ else
                     // Surface
                     print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
                     print '<input name="surface" size="5" value="'.$object->surface.'"> ';
-                    print $formproduct->selectMeasuringUnits("surface_units", "surface", $object->surface_units);
+                    print $formproduct->selectMeasuringUnits("surface_units", "surface", $object->surface_units, 0, 2);
                     print '</td></tr>';
                 }
                 if (empty($conf->global->PRODUCT_DISABLE_VOLUME))
@@ -1442,7 +1442,7 @@ else
                     // Volume
                     print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
                     print '<input name="volume" size="5" value="'.$object->volume.'"> ';
-                    print $formproduct->selectMeasuringUnits("volume_units", "volume", $object->volume_units);
+                    print $formproduct->selectMeasuringUnits("volume_units", "volume", $object->volume_units, 0, 2);
                     print '</td></tr>';
                 }
             }
@@ -1818,11 +1818,12 @@ else
                 print '<tr><td class="titlefield">'.$langs->trans("Nature").'</td><td colspan="2">';
                 print $object->getLibFinished();
                 print '</td></tr>';
+
                 // Weight
                 print '<tr><td class="titlefield">'.$langs->trans("Weight").'</td><td colspan="2">';
                 if ($object->weight != '')
                 {
-                    print $object->weight." ".measuring_units_string($object->weight_units, "weight");
+                	print $object->weight." ".measuring_units_string(0, "weight", $object->weight_units);
                 }
                 else
                 {
@@ -1838,7 +1839,7 @@ else
                         print $object->length;
                         if ($object->width) print " x ".$object->width;
                         if ($object->height) print " x ".$object->height;
-                        print ' '.measuring_units_string($object->length_units, "size");
+                        print ' '.measuring_units_string(0, "size", $object->length_units);
                     }
                     else
                     {
@@ -1852,7 +1853,7 @@ else
                     print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="2">';
                     if ($object->surface != '')
                     {
-                        print $object->surface." ".measuring_units_string($object->surface_units, "surface");
+                    	print $object->surface." ".measuring_units_string(0, "surface", $object->surface_units);
                     }
                     else
                     {
@@ -1866,7 +1867,7 @@ else
                     print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="2">';
                     if ($object->volume != '')
                     {
-                        print $object->volume." ".measuring_units_string($object->volume_units, "volume");
+                    	print $object->volume." ".measuring_units_string(0, "volume", $object->volume_units);
                     }
                     else
                     {
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 4f388798074..fa7ff98eae6 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -308,7 +308,7 @@ class FormProduct
 	 *  @param  string		$measuring_style     Unit to show: weight, size, surface, volume, time
 	 *  @param  string		$default             Preselected value
 	 *  @param  int			$adddefault			 Add empty unit called "Default"
-	 *  @param  int         $mode                1=Use short label as value, 0=Use rowid
+	 *  @param  int         $mode                1=Use short label as value, 0=Use rowid, 2=Use scale (power)
 	 *  @return string
 	 */
 	public function selectMeasuringUnits($name = 'measuring_units', $measuring_style = '', $default = '0', $adddefault = 0, $mode = 0)
@@ -345,10 +345,12 @@ class FormProduct
 			{
 				$return .= '<option value="';
 				if ($mode == 1) $return .= $lines->short_label;
+				elseif ($mode == 2) $return .= $lines->scale;
 				else $return .= $lines->id;
 				$return .= '"';
 				if ($mode == 1 && $lines->short_label == $default) $return .= ' selected';
-				if ($mode == 0 && $lines->id == $default) $return .= ' selected';
+				elseif ($mode == 2 && $lines->scale == $default) $return .= ' selected';
+				elseif ($mode == 0 && $lines->id == $default) $return .= ' selected';
 				$return .= '>';
 				if ($measuring_style == 'time') $return.= $langs->trans(ucfirst($lines->label));
 				else $return .= $langs->trans($lines->label);

From d2881eb85b75310a126efe38b3f3de88c4c6d3f8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 29 Sep 2019 19:22:01 +0200
Subject: [PATCH 11/48] FIX CSS

Conflicts:
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
---
 htdocs/core/class/extrafields.class.php               | 2 +-
 htdocs/core/tpl/extrafields_list_search_input.tpl.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 08456ae19ca..dd77e91f7c4 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1557,7 +1557,7 @@ class ExtraFields
 		{
 			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
 			$showempty=(($required && $default != '')?0:1);
-			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
+			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss);
 		}
 		elseif ($type == 'password')
 		{
diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
index b4a98946f94..27efb5fd898 100644
--- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
@@ -36,7 +36,7 @@ if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_
 				{
 					// for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
 					$morecss='';
-					if ($typeofextrafield == 'sellist') $morecss='maxwidth200';
+					if (in_array($typeofextrafield, array('link', 'sellist'))) $morecss='maxwidth200';
 					echo $extrafields->showInputField($key, $search_array_options[$search_options_pattern.$tmpkey], '', '', $search_options_pattern, $morecss);
 				}
 				elseif (in_array($typeofextrafield, array('datetime','timestamp')))

From 945dd0ae897c2510a7fbdc3d30347d97f4003f78 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 30 Sep 2019 18:12:43 +0200
Subject: [PATCH 12/48] Update card.php

---
 htdocs/compta/facture/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index ee43cbf6a19..0c1e59f08fc 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3047,7 +3047,7 @@ if ($action == 'create')
 			{
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 				$tmp='<input type="radio" id="radio_creditnote" name="type" value="2"' . (GETPOST('type') == 2 ? ' checked' : '');
-				if ( ! $optionsav && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE) ) $tmp.=' disabled';
+				if (! $optionsav && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) $tmp.=' disabled';
 				$tmp.= '> ';
 				// Show credit note options only if we checked credit note
 				print '<script type="text/javascript" language="javascript">

From 2167e7ed98b2b5085e1cb7d9ef6fc677ba3dbde6 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Tue, 1 Oct 2019 09:12:51 +0200
Subject: [PATCH 13/48] FIX : hidden conf to prevent from changing product_type

---
 htdocs/product/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index f03a6db0e17..406fb970016 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1598,7 +1598,7 @@ else
 				// TODO change for compatibility with edit in place
 				$typeformat='select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 				print '<tr><td class="titlefield">';
-				print (!empty($conf->global->MAIN_ALLOW_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
+				print (empty($conf->global->MAIN_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
 				print '</td><td colspan="2">';
 				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat);
 				print '</td></tr>';

From 6ee17022c06ba3a0ac98a0d01e87902037115566 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 Oct 2019 11:33:43 +0200
Subject: [PATCH 14/48] Fix bad key for type of contact of resources

---
 htdocs/admin/dict.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index ee90a0638fb..e92cc80a08e 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -563,7 +563,7 @@ if ($id == 11)
 			'project'           => $langs->trans('Project'),
 			'project_task'      => $langs->trans('Task'),
 			'agenda'			=> $langs->trans('Agenda'),
-			'resource'           => $langs->trans('Resource'),
+			'dolresource'       => $langs->trans('Resource'),
 			// old deprecated
 			'propal'            => $langs->trans('Proposal'),
 			'commande'          => $langs->trans('Order'),

From 15e646cc6235c38b05c4355f09d2032b6b6b77a7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 Oct 2019 11:28:10 +0200
Subject: [PATCH 15/48] Fix bad name of trigger

---
 htdocs/core/class/html.formticket.class.php | 4 ++--
 htdocs/core/lib/functions.lib.php           | 4 ++--
 htdocs/ticket/card.php                      | 2 +-
 htdocs/ticket/class/ticket.class.php        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index a7797f91833..cdb595883f3 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -147,7 +147,7 @@ class FormTicket
         $extrafields = new ExtraFields($this->db);
         $extralabels = $extrafields->fetch_name_optionals_label($ticketstat->table_element);
 
-        print "\n<!-- Begin form TICKETSUP -->\n";
+        print "\n<!-- Begin form TICKET -->\n";
 
         if ($withdolfichehead) dol_fiche_head(null, 'card', '', 0, '');
 
@@ -837,7 +837,7 @@ class FormTicket
             $outputlangs->load('other');
         }
 
-        print "\n<!-- Begin message_form TICKETSUP -->\n";
+        print "\n<!-- Begin message_form TICKET -->\n";
 
         $send_email = GETPOST('send_email', 'int') ? GETPOST('send_email', 'int') : 0;
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2af7dcd1b9e..27a197a88fb 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1347,12 +1347,12 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 	{
 		$width=80; $cssclass='photoref';
 		$showimage=$object->is_photo_available($conf->ticket->multidir_output[$entity].'/'.$object->ref);
-		$maxvisiblephotos=(isset($conf->global->TICKETSUP_MAX_VISIBLE_PHOTO)?$conf->global->TICKETSUP_MAX_VISIBLE_PHOTO:2);
+		$maxvisiblephotos=(isset($conf->global->TICKET_MAX_VISIBLE_PHOTO)?$conf->global->TICKET_MAX_VISIBLE_PHOTO:2);
 		if ($conf->browser->layout == 'phone') $maxvisiblephotos=1;
 		if ($showimage) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';
 		else
 		{
-			if (!empty($conf->global->TICKETSUP_NODISPLAYIFNOPHOTO)) {
+			if (!empty($conf->global->TICKET_NODISPLAYIFNOPHOTO)) {
 				$nophoto='';
 				$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref"></div>';
 			}
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 2c52ec513ff..eb47bc7044f 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -97,7 +97,7 @@ $url_page_current = DOL_URL_ROOT.'/ticket/card.php';
 //if ($user->societe_id > 0) $socid = $user->societe_id;
 $result = restrictedArea($user, 'ticket', $object->id);
 
-$triggermodname = 'TICKETSUP_MODIFY';
+$triggermodname = 'TICKET_MODIFY';
 $permissiontoadd = $user->rights->ticket->write;
 
 $actionobject = new ActionsTicket($db);
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 72cddcce607..1ae0bb56aae 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -2669,7 +2669,7 @@ class Ticket extends CommonObject
         global $conf, $langs;
 
         if ($conf->global->TICKET_DISABLE_ALL_MAILS) {
-            dol_syslog(get_class($this) . '::sendTicketMessageByEmail: Emails are disable into ticket setup by option TICKETSUP_DISABLE_ALL_MAILS', LOG_WARNING);
+            dol_syslog(get_class($this) . '::sendTicketMessageByEmail: Emails are disable into ticket setup by option TICKET_DISABLE_ALL_MAILS', LOG_WARNING);
             return '';
         }
 

From 322786cabeaf00d9ee68535014a11608f732bd54 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 Oct 2019 01:35:11 +0200
Subject: [PATCH 16/48] Look and feel v10

---
 htdocs/admin/facture.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 765f2e6f995..e21dc942284 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -808,36 +808,39 @@ print '</table>';
 print '<br>';
 print load_fiche_titre($langs->trans("PathToDocuments"), '', '');
 
-print '<table class="noborder" width="100%">'."\n";
+print '<div class="div-table-responsive-no-min">';
+print '<table class="noborder centpercent">'."\n";
 print '<tr class="liste_titre">'."\n";
 print '<td>'.$langs->trans("Name").'</td>'."\n";
 print '<td>'.$langs->trans("Value").'</td>'."\n";
 print "</tr>\n";
-print '<tr '.$bc[false].'>'."\n";
+print '<tr class="oddeven">'."\n";
 print '<td width="140">'.$langs->trans("PathDirectory").'</td>'."\n";
 print '<td>'.$conf->facture->dir_output.'</td>'."\n";
 print '</tr>'."\n";
 print "</table>\n";
-
+print "</div>\n";
 
 /*
  * Notifications
  */
 print '<br>';
 print load_fiche_titre($langs->trans("Notifications"), '', '');
-print '<table class="noborder" width="100%">';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td class="center" width="60"></td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
-
 print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'<br>';
 print '</td><td class="right">';
 print "</td></tr>\n";
-
 print '</table>';
+print "</div>\n";
+
 
 dol_fiche_end();
 

From d2015155140ca619c3b73ce5c94765bd11903790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 30 Sep 2019 22:40:07 +0200
Subject: [PATCH 17/48] Update box_prospect.php

---
 htdocs/core/boxes/box_prospect.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 7f5cc566f42..1370ecc9eb9 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2015      Frederic France      <frederic.france@free.fr>
+ * Copyright (C) 2015-2019 Frederic France      <frederic.france@netlogic.fr>
  *
  * 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
@@ -88,7 +88,7 @@ class box_prospect extends ModeleBoxes
 		{
 			$sql = "SELECT s.nom as name, s.rowid as socid";
 			$sql.= ", s.code_client";
-            $sql.= ", s.client";
+            $sql.= ", s.client, s.email";
             $sql.= ", s.code_fournisseur";
             $sql.= ", s.fournisseur";
             $sql.= ", s.logo";
@@ -116,6 +116,7 @@ class box_prospect extends ModeleBoxes
 					$datem=$db->jdate($objp->tms);
 					$thirdpartystatic->id = $objp->socid;
                     $thirdpartystatic->name = $objp->name;
+                    $thirdpartystatic->email = $objp->email;
                     $thirdpartystatic->code_client = $objp->code_client;
                     $thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
                     $thirdpartystatic->client = $objp->client;

From 4ff65ce5862067bd606ae49bd75474711908d20b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 30 Sep 2019 22:43:13 +0200
Subject: [PATCH 18/48] Update box_supplier_orders.php

---
 htdocs/core/boxes/box_supplier_orders.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 6874425db78..85ee2e6f71c 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004-2006 Destailleur Laurent  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2012      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2015      Frederic France      <frederic.france@free.fr>
+ * Copyright (C) 2015-2019 Frederic France      <frederic.france@netlogic.fr>
  *
  * 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
@@ -85,7 +85,7 @@ class box_supplier_orders extends ModeleBoxes
         {
             $sql = "SELECT s.nom as name, s.rowid as socid,";
             $sql.= " s.code_client, s.code_fournisseur,";
-            $sql.= " s.logo,";
+            $sql.= " s.logo, s.email,";
             $sql.= " c.rowid, c.ref, c.tms, c.date_commande,";
             $sql.= " c.total_ht,";
             $sql.= " c.tva as total_tva,";
@@ -118,6 +118,7 @@ class box_supplier_orders extends ModeleBoxes
 
 					$thirdpartytmp->id = $objp->socid;
                     $thirdpartytmp->name = $objp->name;
+                    $thirdpartytmp->email = $objp->email;
                     $thirdpartytmp->fournisseur = 1;
                     $thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
                     $thirdpartytmp->logo = $objp->logo;

From 7872a93605a1de7559b4f736bcde3d00a9b3cc5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 30 Sep 2019 22:45:28 +0200
Subject: [PATCH 19/48] Update box_commandes.php

---
 htdocs/core/boxes/box_commandes.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index 956e73b4acf..127da074360 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -89,7 +89,7 @@ class box_commandes extends ModeleBoxes
             $sql = "SELECT s.nom as name";
             $sql.= ", s.rowid as socid";
             $sql.= ", s.code_client";
-            $sql.= ", s.logo";
+            $sql.= ", s.logo, s.email";
             $sql.= ", c.ref, c.tms";
             $sql.= ", c.rowid";
             $sql.= ", c.date_commande";
@@ -130,6 +130,7 @@ class box_commandes extends ModeleBoxes
                     $commandestatic->total_ttc = $objp->total_ttc;
                     $societestatic->id = $objp->socid;
                     $societestatic->name = $objp->name;
+                    $societestatic->email = $objp->email;
                     $societestatic->code_client = $objp->code_client;
                     $societestatic->logo = $objp->logo;
 

From 956b46d92016d828142c44e8c7c38d8233c9bc20 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 30 Sep 2019 21:51:42 +0200
Subject: [PATCH 20/48] Fix warnings

---
 htdocs/install/inc.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 54a718ef1fc..cea7b9f31b5 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -545,12 +545,16 @@ function detect_dolibarr_main_url_root()
 		$dolibarr_main_url_root = $_SERVER["SERVER_URL"] . $_SERVER["DOCUMENT_URI"];
 	} // If SCRIPT_URI, SERVER_URL, DOCUMENT_URI not defined (Ie: Apache 2.0.44 for Windows)
 	else {
-        $proto = ( (!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') || $_SERVER['SERVER_PORT'] == 443) ? 'https' : 'http';
+		$proto = ((!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') || (! empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443)) ? 'https' : 'http';
 		if (!empty($_SERVER["HTTP_HOST"])) {
 			$serverport = $_SERVER["HTTP_HOST"];
-		} else {
+		}
+		elseif (!empty($_SERVER["SERVER_NAME"])) {
 			$serverport = $_SERVER["SERVER_NAME"];
 		}
+		else {
+			$serverport = 'localhost';
+		}
 		$dolibarr_main_url_root = $proto . "://" . $serverport . $_SERVER["SCRIPT_NAME"];
 	}
 	// Clean proposed URL

From 64381ac4d6f2be041a1f510abdc7c74c863732a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 30 Sep 2019 21:51:04 +0200
Subject: [PATCH 21/48] Update api_boms.class.php

---
 htdocs/bom/class/api_boms.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index 54f289a5b23..8b3ca1b1699 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -302,7 +302,7 @@ class Boms extends DolibarrApi
     private function _validate($data)
     {
         $myobject = array();
-        foreach ($this->myobject->fields as $field => $propfield) {
+        foreach ($this->bom->fields as $field => $propfield) {
             if (in_array($field, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat')) || $propfield['notnull'] != 1) continue;   // Not a mandatory field
             if (!isset($data[$field]))
                 throw new RestException(400, "$field field missing");

From 9b607a3105057be082f8cc70dafdd1df518a77a2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 Oct 2019 12:28:56 +0200
Subject: [PATCH 22/48] FIX navigation on ticket tab of projects

---
 htdocs/ticket/list.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 26b9756006c..30dd3bc1675 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -53,6 +53,7 @@ $id			= GETPOST('id', 'int');
 $msg_id     = GETPOST('msg_id', 'int');
 $socid      = GETPOST('socid', 'int');
 $projectid  = GETPOST('projectid', 'int');
+$project_ref= GETPOST('project_ref', 'alpha');
 $search_societe = GETPOST('search_societe', 'alpha');
 $search_fk_project=GETPOST('search_fk_project', 'int')?GETPOST('search_fk_project', 'int'):GETPOST('projectid', 'int');
 $search_fk_status = GETPOST('search_fk_statut', 'array');
@@ -300,7 +301,7 @@ if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) &&
 llxHeader('', $title, $help_url);
 
 
-if ($socid && !$projectid && $user->rights->societe->lire) {
+if ($socid && ! $projectid && ! $project_ref && $user->rights->societe->lire) {
     $socstat = new Societe($db);
     $res = $socstat->fetch($socid);
     if ($res > 0) {
@@ -350,9 +351,10 @@ if ($socid && !$projectid && $user->rights->societe->lire) {
     }
 }
 
-if ($projectid > 0) {
+if ($projectid > 0 || $project_ref) {
     $projectstat = new Project($db);
-    if ($projectstat->fetch($projectid) > 0) {
+    if ($projectstat->fetch($projectid, $project_ref) > 0) {
+    	$projectid = $projectstat->id;
         $projectstat->fetch_thirdparty();
 
         $savobject = $object;
@@ -388,7 +390,7 @@ if ($projectid > 0) {
         	$object->next_prev_filter=" rowid in (".(count($objectsListId)?join(',', array_keys($objectsListId)):'0').")";
         }
 
-        dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+        dol_banner_tab($object, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
         print '<div class="fichecenter">';
         print '<div class="underbanner clearboth"></div>';

From 2d42afc686705008269a20e55c35a9d5bdde1e61 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 Oct 2019 12:36:22 +0200
Subject: [PATCH 23/48] FIX Filter on project on ticket list

---
 htdocs/ticket/list.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 30dd3bc1675..cc6d7a265e9 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -131,6 +131,13 @@ if (!$user->rights->ticket->read) {
 // Store current page url
 $url_page_current = dol_buildpath('/ticket/list.php', 1);
 
+if ($project_ref)
+{
+	$tmpproject = new Project($db);
+	$tmpproject->fetch(0, $project_ref);
+	$projectid = $tmpproject->id;
+	$search_fk_project = $projectid;
+}
 
 
 /*

From d6198a1e331fb774168f782e96bf0310966f067b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 Oct 2019 13:47:12 +0200
Subject: [PATCH 24/48] Fix billed time is empty

---
 htdocs/projet/class/task.class.php | 22 +++++++++++-----------
 htdocs/projet/tasks.php            |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index ce4779e1a6d..b4da8296044 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -752,21 +752,21 @@ class Task extends CommonObject
 		$sql.= " t.rowid as taskid, t.ref as taskref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress, t.fk_statut as status,";
 		$sql.= " t.dateo as date_start, t.datee as date_end, t.planned_workload, t.rang,";
 		$sql.= " s.rowid as thirdparty_id, s.nom as thirdparty_name, s.email as thirdparty_email,";
-    $sql.= " p.fk_opp_status, p.opp_amount, p.opp_percent, p.budget_amount";
-    if (!empty($extrafields->attributes['projet']['label']))
-    {
-        foreach ($extrafields->attributes['projet']['label'] as $key => $val) $sql.=($extrafields->attributes['projet']['type'][$key] != 'separate' ? ",efp.".$key.' as options_'.$key : '');
-    }
-    if (!empty($extrafields->attributes['projet_task']['label']))
-    {
-        foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) $sql.=($extrafields->attributes['projet_task']['type'][$key] != 'separate' ? ",efpt.".$key.' as options_'.$key : '');
-    }
+		$sql.= " p.fk_opp_status, p.opp_amount, p.opp_percent, p.budget_amount";
+		if (!empty($extrafields->attributes['projet']['label']))
+		{
+			foreach ($extrafields->attributes['projet']['label'] as $key => $val) $sql.=($extrafields->attributes['projet']['type'][$key] != 'separate' ? ",efp.".$key.' as options_'.$key : '');
+		}
+		if (!empty($extrafields->attributes['projet_task']['label']))
+		{
+			foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) $sql.=($extrafields->attributes['projet_task']['type'][$key] != 'separate' ? ",efpt.".$key.' as options_'.$key : '');
+		}
 		if ($includebilltime)
 		{
-		    $sql.=", SUM(tt.task_duration * ".$this->db->ifsql("invoice_id IS NULL", "1", "0").") as tobill, SUM(tt.task_duration * ".$this->db->ifsql("invoice_id IS NULL", "0", "1").") as billed";
+			$sql.=", SUM(tt.task_duration * ".$this->db->ifsql("invoice_id IS NULL", "1", "0").") as tobill, SUM(tt.task_duration * ".$this->db->ifsql("invoice_id IS NULL", "0", "1").") as billed";
 		}
 
-    $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+		$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_extrafields as efp ON (p.rowid = efp.fk_object)";
 
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index b8ac9fb7e02..6fd6e8ac8ec 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -675,7 +675,7 @@ elseif ($id > 0 || ! empty($ref))
 	// Get list of tasks in tasksarray and taskarrayfiltered
 	// We need all tasks (even not limited to a user because a task to user can have a parent that is not affected to him).
 	$filteronthirdpartyid = $socid;
-	$tasksarray=$taskstatic->getTasksArray(0, 0, $object->id, $filteronthirdpartyid, 0, '', -1, $morewherefilter, 0, 0, 1);
+	$tasksarray=$taskstatic->getTasksArray(0, 0, $object->id, $filteronthirdpartyid, 0, '', -1, $morewherefilter, 0, 0, array(), 1);
 	// We load also tasks limited to a particular user
 	$tmpuser=new User($db);
 	if ($search_user_id > 0) $tmpuser->fetch($search_user_id);

From d448998762dce672c082d95286095b440e34bd11 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 Oct 2019 14:41:25 +0200
Subject: [PATCH 25/48] Update card.php

---
 htdocs/product/card.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 406fb970016..244f8cd4c63 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -12,7 +12,6 @@
  * Copyright (C) 2014		Cédric Gross			<c.gross@kreiz-it.fr>
  * Copyright (C) 2014-2015	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
- * Copyright (C) 2015		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016		Charlie Benke			<charlie@patas-monkey.com>
  * Copyright (C) 2016		Meziane Sof				<virtualsof@yahoo.fr>
  *
@@ -1598,7 +1597,7 @@ else
 				// TODO change for compatibility with edit in place
 				$typeformat='select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 				print '<tr><td class="titlefield">';
-				print (empty($conf->global->MAIN_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
+				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
 				print '</td><td colspan="2">';
 				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat);
 				print '</td></tr>';

From ad3cbd17c2a2918cb1bb6c6fc10011258151e2f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 2 Oct 2019 11:12:30 +0200
Subject: [PATCH 26/48] backport commit for setmulticurrency

https://github.com/Dolibarr/dolibarr/commit/a4892071227156be6a0c8729c91b46eb6474aca2#diff-48f18024fb928ce21b76ef02fc967c67
---
 htdocs/core/class/commonobject.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 251ca43694d..61a94438841 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1876,10 +1876,16 @@ abstract class CommonObject
 				{
 					foreach ($this->lines as &$line)
 					{
+						// Amounts in company currency will be recalculated
 						if($mode == 1) {
 							$line->subprice = 0;
 						}
 
+						// Amounts in foreign currency will be recalculated
+						if($mode == 2) {
+							$line->multicurrency_subprice = 0;
+						}
+
 						switch ($this->element) {
 							case 'propal':
 								$this->updateline(

From 0d41216624ba6c5b4f464b8dba7d48e48a84d763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 3 Oct 2019 00:22:14 +0200
Subject: [PATCH 27/48] Update dolgraph.class.php

---
 htdocs/core/class/dolgraph.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index d7850871ee0..8bf7b471473 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -944,7 +944,7 @@ class DolGraph
 		$tag=dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file), '_', array('-','.'))));
 
 		$this->stringtoshow ='<!-- Build using '.$this->_library.' -->'."\n";
-		if (! empty($this->title)) $this->stringtoshow.='<div class="center" class="dolgraphtitle'.(empty($this->cssprefix)?'':' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';
+		if (! empty($this->title)) $this->stringtoshow.='<div class="center dolgraphtitle'.(empty($this->cssprefix)?'':' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';
 		if (! empty($this->shownographyet))
 		{
 		  $this->stringtoshow.='<div style="width:'.$this->width.'px;height:'.$this->height.'px;" class="nographyet"></div>';

From ae01bd8f07e43dbcbb8fc5278a0d682e0ef5177e Mon Sep 17 00:00:00 2001
From: atm-lena <lena@atm-consulting.fr>
Date: Thu, 3 Oct 2019 17:23:16 +0200
Subject: [PATCH 28/48] FIX missing begin()

---
 htdocs/fourn/class/fournisseur.commande.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index f32d9d24c01..eed1bbf9eda 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -3363,6 +3363,8 @@ class CommandeFournisseurLigne extends CommonOrderLine
 
         $error=0;
 
+        $this->db->begin();
+
         // Mise a jour ligne en base
         $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
         $sql.= "  description='".$this->db->escape($this->desc)."'";

From aa484d484ddb84d859c6003afd47253114258f54 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Oct 2019 19:02:29 +0200
Subject: [PATCH 29/48] css

---
 htdocs/core/tpl/extrafields_view.tpl.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 1a860e522b1..e4cb18e18bd 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -109,7 +109,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 		{
             print '<tr class="trextrafields_collapse'.$extrafields_collapse_num.'">';
 			print '<td class="titlefield">';
-			print '<table width="100%" class="nobordernopadding">';
+			print '<table class="nobordernopadding centpercent">';
 			print '<tr>';
 			print '<td class="';
 			//var_dump($action);exit;
@@ -138,7 +138,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 			{
 			    $fieldid='id';
 			    if ($object->table_element == 'societe') $fieldid='socid';
-			    print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?'.$fieldid.'=' . $object->id . '&action=edit_extras&attribute=' . $key . '&ignorecollapsesetup=1">' . img_edit().'</a></td>';
+			    print '<td class="right"><a class="reposition editfielda" href="' . $_SERVER['PHP_SELF'] . '?'.$fieldid.'=' . $object->id . '&action=edit_extras&attribute=' . $key . '&ignorecollapsesetup=1">' . img_edit().'</a></td>';
 			}
 			print '</tr></table>';
 			print '</td>';

From 6cd3d278852b3b441779e9656b93a070eba090e1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Oct 2019 09:54:52 +0200
Subject: [PATCH 30/48] Fix comparison

---
 htdocs/compta/facture/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 257a9cbfb05..0072d9ff7a6 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4622,7 +4622,7 @@ elseif ($id > 0 || ! empty($ref))
 
 				if ($ventilExportCompta == 0)
 				{
-					if (! empty($conf->global->INVOICE_CAN_ALWAYS_BE_EDITED) || ($resteapayer == $object->total_ttc && empty($object->paye)))
+					if (! empty($conf->global->INVOICE_CAN_ALWAYS_BE_EDITED) || ($resteapayer == price2num($object->total_ttc, 'MT', 1) && empty($object->paye)))
 					{
 						if (! $objectidnext && $object->is_last_in_cycle())
 						{

From 0b9d27423d073ee61608e31220682cc8f0e2fd92 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Oct 2019 10:31:57 +0200
Subject: [PATCH 31/48] FIX Can't modify vendor invoice if transfered into
 accountancy

---
 htdocs/compta/facture/card.php |   6 +-
 htdocs/compta/paiement.php     |   4 +-
 htdocs/fourn/facture/card.php  | 104 ++++++++++++++++++---------------
 3 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 0072d9ff7a6..1b6b4a50e01 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4617,7 +4617,7 @@ elseif ($id > 0 || ! empty($ref))
 			// Editer une facture deja validee, sans paiement effectue et pas exporte en compta
 			if ($object->statut == Facture::STATUS_VALIDATED)
 			{
-				// On verifie si les lignes de factures ont ete exportees en compta et/ou ventilees
+				// We check if lines of invoice are not already transfered into accountancy
 				$ventilExportCompta = $object->getVentilExportCompta();
 
 				if ($ventilExportCompta == 0)
@@ -4652,7 +4652,7 @@ elseif ($id > 0 || ! empty($ref))
 			if ((($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT)
 				|| ($object->type == Facture::TYPE_CREDIT_NOTE && empty($discount->id))
 				|| ($object->type == Facture::TYPE_DEPOSIT && empty($discount->id)))
-				&& ($object->statut == 2 || $object->statut == 3 || ($object->statut == 1 && $object->paye == 1))   // Condition ($object->statut == 1 && $object->paye == 1) should not happened but can be found due to corrupted data
+				&& ($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED || ($object->statut == 1 && $object->paye == 1))   // Condition ($object->statut == 1 && $object->paye == 1) should not happened but can be found due to corrupted data
 				&& ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || $usercanreopen))				// A paid invoice (partially or completely)
 			{
 			    if ($object->close_code != 'replaced' || (! $objectidnext)) 				// Not replaced by another invoice or replaced but the replacement invoice has been deleted
@@ -4834,7 +4834,7 @@ elseif ($id > 0 || ! empty($ref))
 			    }
 			}
 
-			// remove situation from cycle
+			// Remove situation from cycle
 			if ($object->statut > Facture::STATUS_DRAFT
 			    && $object->type == Facture::TYPE_SITUATION
 			    && $usercancreate
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index e8fceebb03c..39f19b6e34c 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -639,7 +639,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 					print '<tr class="oddeven">';
 
-					print '<td>';
+					print '<td class="nowraponall">';
                     print $invoice->getNomUrl(1, '');
                     if ($objp->socid != $facture->thirdparty->id) print ' - '.$soc->getNomUrl(1).' ';
                     print "</td>\n";
@@ -650,7 +650,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                     // Due date
                     if ($objp->dlr > 0 )
                     {
-                        print '<td align="center">';
+                        print '<td class="nowraponall center">';
                         print dol_print_date($db->jdate($objp->dlr), 'day');
 
                         if ($invoice->hasDelay())
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index c25b0afa15b..67629c7d20c 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1416,58 +1416,61 @@ if (empty($reshook))
 		$resteapayer = $object->total_ttc - $totalpaye;
 
 		// On verifie si les lignes de factures ont ete exportees en compta et/ou ventilees
-		//$ventilExportCompta = $object->getVentilExportCompta();
+		$ventilExportCompta = $object->getVentilExportCompta();
 
-	    // On verifie si aucun paiement n'a ete effectue
-	    if ($resteapayer == $object->total_ttc && $object->paye == 0 && $ventilExportCompta == 0)
-	    {
-            $idwarehouse = GETPOST('idwarehouse');
+		if (! $ventilExportCompta)
+		{
+		    // On verifie si aucun paiement n'a ete effectue
+			if ($resteapayer == price2num($object->total_ttc, 'MT', 1) && $object->statut == FactureFournisseur::STATUS_VALIDATED)
+		    {
+	            $idwarehouse = GETPOST('idwarehouse');
 
-            $object->fetch_thirdparty();
+	            $object->fetch_thirdparty();
 
-            $qualified_for_stock_change=0;
-            if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-            {
-                $qualified_for_stock_change=$object->hasProductsOrServices(2);
-            }
-            else
-            {
-                $qualified_for_stock_change=$object->hasProductsOrServices(1);
-            }
+	            $qualified_for_stock_change=0;
+	            if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+	            {
+	                $qualified_for_stock_change=$object->hasProductsOrServices(2);
+	            }
+	            else
+	            {
+	                $qualified_for_stock_change=$object->hasProductsOrServices(1);
+	            }
 
-            // Check parameters
-            if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
-            {
-                $langs->load("stocks");
-                if (! $idwarehouse || $idwarehouse == -1)
-                {
-                    $error++;
-                    setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
-                    $action='';
-                }
-            }
+	            // Check parameters
+	            if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
+	            {
+	                $langs->load("stocks");
+	                if (! $idwarehouse || $idwarehouse == -1)
+	                {
+	                    $error++;
+	                    setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
+	                    $action='';
+	                }
+	            }
 
-            $object->setDraft($user, $idwarehouse);
+	            $object->setDraft($user, $idwarehouse);
 
-			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
-				$outputlangs = $langs;
-				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-				if (! empty($newlang)) {
-					$outputlangs = new Translate("", $conf);
-					$outputlangs->setDefaultLang($newlang);
+				// Define output language
+				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+				{
+					$outputlangs = $langs;
+					$newlang = '';
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+					if (! empty($newlang)) {
+						$outputlangs = new Translate("", $conf);
+						$outputlangs->setDefaultLang($newlang);
+					}
+					$model=$object->modelpdf;
+					$ret = $object->fetch($id); // Reload to get new records
+
+					$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+					if ($result < 0) dol_print_error($db, $result);
 				}
-				$model=$object->modelpdf;
-				$ret = $object->fetch($id); // Reload to get new records
 
-				$result=$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				if ($result < 0) dol_print_error($db, $result);
+				$action='';
 			}
-
-			$action='';
 		}
 	}
 
@@ -3032,11 +3035,20 @@ else
 																									  // modified by hook
 			if (empty($reshook))
 			{
-
 			    // Modify a validated invoice with no payments
 				if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $action != 'confirm_edit' && $object->getSommePaiement() == 0 && $user->rights->fournisseur->facture->creer)
 				{
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans('Modify').'</a></div>';
+					// We check if lines of invoice are not already transfered into accountancy
+					$ventilExportCompta = $object->getVentilExportCompta();	// Should be 0 since the sum of payments are zero. But we keep the protection.
+
+					if ($ventilExportCompta == 0)
+					{
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans('Modify').'</a></div>';
+					}
+					else
+					{
+						print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="' . $langs->trans("DisabledBecauseDispatchedInBookkeeping") . '">' . $langs->trans('Modify') . '</span></div>';
+					}
 				}
 
 				$discount = new DiscountAbsolute($db);
@@ -3045,7 +3057,7 @@ else
 	 	 		// Reopen a standard paid invoice
 				if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_REPLACEMENT
 					|| ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && empty($discount->id)))
-					&& ($object->statut == 2 || $object->statut == 3))				// A paid invoice (partially or completely)
+					&& ($object->statut == FactureFournisseur::STATUS_CLOSED || $object->statut == FactureFournisseur::STATUS_ABANDONED))				// A paid invoice (partially or completely)
 				{
 					if (! $facidnext && $object->close_code != 'replaced' && $user->rights->fournisseur->facture->creer)	// Not replaced by another invoice
 					{

From 68c28ab3c713103713ed78870c15d17305e5cf3d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Oct 2019 12:31:25 +0200
Subject: [PATCH 32/48] FIX Look and feel v10

---
 htdocs/societe/project.php | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index 0a345fc6369..dd6c4b46cdf 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -119,25 +119,7 @@ if ($socid)
 	dol_fiche_end();
 
 
-    /*
-     * Barre d'action
-     */
-
-    /*print '<div class="tabsAction">';
-
-    if (! empty($conf->projet->enabled))
-    {
-    	if (! empty($conf->projet->enabled) && ! empty($user->rights->projet->creer))
-    	{*/
-        	$addbutton = '<a href="'.DOL_URL_ROOT.'/projet/card.php?action=create&socid='.$object->id.'&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddProject").'</a>';
-    /*	}
-    	else
-    	{
-        	print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddProject").'</a>';
-    	}
-    }
-
-    print '</div>'; */
+   	$addbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/projet/card.php?action=create&socid='.$object->id.'&amp;backtopage='.urlencode($backtopage).'"><span class="text-plus-circle">'.$langs->trans("AddProject").'</span><span class="fa fa-plus-circle valignmiddle"></span></a>';
 
     print '<br>';
 

From c3fa770871ac5d1c5efafe749bb89385051421c8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Oct 2019 13:06:24 +0200
Subject: [PATCH 33/48] FIX Filter "Open all" of ticket was ko.

---
 htdocs/ticket/list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index cc6d7a265e9..2bfc1719360 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -229,8 +229,8 @@ foreach($search as $key => $val)
     if ($key == 'fk_statut')
 	{
 	    $tmpstatus='';
-	    if ($search['fk_statut'] == 'openall' || in_array('openall', $search['fk_statut'])) $tmpstatus.=($tmpstatus?',':'')."'0', '1', '3', '4', '5', '6'";
-	    if ($search['fk_statut'] == 'closeall' || in_array('closeall', $search['fk_statut'])) $tmpstatus.=($tmpstatus?',':'')."'8', '9'";
+	    if ($search['fk_statut'] == 'openall' || in_array('openall', $search['fk_statut'])) $tmpstatus.=($tmpstatus?',':'')."'".Ticket::STATUS_NOT_READ."', '".Ticket::STATUS_READ."', '".Ticket::STATUS_ASSIGNED."', '".Ticket::STATUS_IN_PROGRESS."', '".Ticket::STATUS_NEED_MORE_INFO."', '".Ticket::STATUS_WAITING."'";
+	    if ($search['fk_statut'] == 'closeall' || in_array('closeall', $search['fk_statut'])) $tmpstatus.=($tmpstatus?',':'')."'".Ticket::STATUS_CLOSED."', '".Ticket::STATUS_CANCELED."'";
 	    if ($tmpstatus) $sql.=" AND fk_statut IN (".$tmpstatus.")";
 	    elseif (is_array($search[$key]) && count($search[$key])) $sql.=natural_search($key, join(',', $search[$key]), 2);
 	    continue;

From 503973cec97c608de0b039008c26409f56d0ff11 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Oct 2019 14:04:31 +0200
Subject: [PATCH 34/48] FIX Edit of ticket module parameters erased others

---
 htdocs/admin/ticket.php           |  20 ++---
 htdocs/admin/ticket_public.php    | 143 ++++++++++--------------------
 htdocs/core/lib/functions.lib.php |   3 +
 3 files changed, 60 insertions(+), 106 deletions(-)

diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index 8cb1e85afe4..31e2d8f219a 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -42,6 +42,12 @@ $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scandir', 'alpha');
 $type = 'ticket';
 
+$error = 0;
+
+/*
+ * Actions
+ */
+
 if ($action == 'updateMask') {
     $maskconstticket = GETPOST('maskconstticket', 'alpha');
     $maskticket = GETPOST('maskticket', 'alpha');
@@ -91,7 +97,7 @@ if ($action == 'updateMask') {
         $error++;
     }
 
-    $mail_intro = GETPOST('TICKET_MESSAGE_MAIL_INTRO', 'alpha');
+    $mail_intro = GETPOST('TICKET_MESSAGE_MAIL_INTRO', 'restricthtml');
     if (!empty($mail_intro)) {
         $res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_INTRO', $mail_intro, 'chaine', 0, '', $conf->entity);
     } else {
@@ -101,7 +107,7 @@ if ($action == 'updateMask') {
         $error++;
     }
 
-    $mail_signature = GETPOST('TICKET_MESSAGE_MAIL_SIGNATURE', 'alpha');
+    $mail_signature = GETPOST('TICKET_MESSAGE_MAIL_SIGNATURE', 'restricthtml');
     if (!empty($mail_signature)) {
         $res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_SIGNATURE', $mail_signature, 'chaine', 0, '', $conf->entity);
     } else {
@@ -110,16 +116,6 @@ if ($action == 'updateMask') {
     if (!$res > 0) {
         $error++;
     }
-
-    $text_help = GETPOST('TICKET_PUBLIC_TEXT_HELP_MESSAGE', 'alpha');
-    if (!empty($text_help)) {
-        $res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HELP_MESSAGE', $text_help, 'chaine', 0, '', $conf->entity);
-    } else {
-        $res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HELP_MESSAGE', $langs->trans('TicketPublicPleaseBeAccuratelyDescribe'), 'chaine', 0, '', $conf->entity);
-    }
-    if (!$res > 0) {
-        $error++;
-    }
 }
 
 if ($action == 'setvarother') {
diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
index 4e6b6d75e85..ec36d3f873d 100644
--- a/htdocs/admin/ticket_public.php
+++ b/htdocs/admin/ticket_public.php
@@ -42,6 +42,12 @@ $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scandir', 'alpha');
 $type = 'ticket';
 
+$error = 0;
+
+/*
+ * Actions
+ */
+
 if ($action == 'setTICKET_ENABLE_PUBLIC_INTERFACE')
 {
     if (GETPOST('value')) dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', 1, 'chaine', 0, '', $conf->entity);
@@ -51,95 +57,54 @@ if ($action == 'setTICKET_ENABLE_PUBLIC_INTERFACE')
 if ($action == 'setvar') {
     include_once DOL_DOCUMENT_ROOT . "/core/lib/files.lib.php";
 
-    $notification_email = GETPOST('TICKET_NOTIFICATION_EMAIL_FROM', 'alpha');
-    if (!empty($notification_email)) {
-        $res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_EMAIL_FROM', $notification_email, 'chaine', 0, '', $conf->entity);
+    $topic_interface = GETPOST('TICKET_PUBLIC_INTERFACE_TOPIC', 'nohtml');
+    if (!empty($topic_interface)) {
+    	$res = dolibarr_set_const($db, 'TICKET_PUBLIC_INTERFACE_TOPIC', $topic_interface, 'chaine', 0, '', $conf->entity);
     } else {
-        $res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_EMAIL_FROM', '', 'chaine', 0, '', $conf->entity);
+    	$res = dolibarr_set_const($db, 'TICKET_PUBLIC_INTERFACE_TOPIC', '', 'chaine', 0, '', $conf->entity);
     }
     if (!$res > 0) {
-        $error++;
+    	$error++;
     }
 
-    // altairis : differentiate notification email FROM and TO
-    $notification_email_to = GETPOST('TICKET_NOTIFICATION_EMAIL_TO', 'alpha');
-    if (!empty($notification_email_to)) {
-        $res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_EMAIL_TO', $notification_email_to, 'chaine', 0, '', $conf->entity);
+    $text_home = GETPOST('TICKET_PUBLIC_TEXT_HOME', 'restricthtml');
+    if (!empty($text_home)) {
+    	$res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HOME', $text_home, 'chaine', 0, '', $conf->entity);
     } else {
-        $res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_EMAIL_TO', '', 'chaine', 0, '', $conf->entity);
+    	$res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HOME', $langs->trans('TicketPublicInterfaceTextHome'), 'chaine', 0, '', $conf->entity);
     }
     if (!$res > 0) {
-        $error++;
+    	$error++;
     }
 
-    $mail_new_ticket = GETPOST('TICKET_MESSAGE_MAIL_NEW', 'alpha');
+    $text_help = GETPOST('TICKET_PUBLIC_TEXT_HELP_MESSAGE', 'restricthtml');
+    if (!empty($text_help)) {
+    	$res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HELP_MESSAGE', $text_help, 'chaine', 0, '', $conf->entity);
+    } else {
+    	$res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HELP_MESSAGE', $langs->trans('TicketPublicPleaseBeAccuratelyDescribe'), 'chaine', 0, '', $conf->entity);
+    }
+    if (!$res > 0) {
+    	$error++;
+    }
+
+    $mail_new_ticket = GETPOST('TICKET_MESSAGE_MAIL_NEW', 'restricthtml');
     if (!empty($mail_new_ticket)) {
-        $res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_NEW', $mail_new_ticket, 'chaine', 0, '', $conf->entity);
+    	$res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_NEW', $mail_new_ticket, 'chaine', 0, '', $conf->entity);
     } else {
-        $res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_NEW', $langs->trans('TicketMessageMailNewText'), 'chaine', 0, '', $conf->entity);
+    	$res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_NEW', $langs->trans('TicketMessageMailNewText'), 'chaine', 0, '', $conf->entity);
     }
     if (!$res > 0) {
-        $error++;
-    }
-
-    $mail_intro = GETPOST('TICKET_MESSAGE_MAIL_INTRO', 'alpha');
-    if (!empty($mail_intro)) {
-        $res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_INTRO', $mail_intro, 'chaine', 0, '', $conf->entity);
-    } else {
-        $res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_INTRO', $langs->trans('TicketMessageMailIntroText'), 'chaine', 0, '', $conf->entity);
-    }
-    if (!$res > 0) {
-        $error++;
-    }
-
-    $mail_signature = GETPOST('TICKET_MESSAGE_MAIL_SIGNATURE', 'alpha');
-    if (!empty($mail_signature)) {
-        $res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_SIGNATURE', $mail_signature, 'chaine', 0, '', $conf->entity);
-    } else {
-        $res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_SIGNATURE', $langs->trans('TicketMessageMailSignatureText'), 'chaine', 0, '', $conf->entity);
-    }
-    if (!$res > 0) {
-        $error++;
+    	$error++;
     }
 
     $url_interface = GETPOST('TICKET_URL_PUBLIC_INTERFACE', 'alpha');
     if (!empty($url_interface)) {
-        $res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', $url_interface, 'chaine', 0, '', $conf->entity);
+    	$res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', $url_interface, 'chaine', 0, '', $conf->entity);
     } else {
-        $res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', '', 'chaine', 0, '', $conf->entity);
+    	$res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', '', 'chaine', 0, '', $conf->entity);
     }
     if (!$res > 0) {
-        $error++;
-    }
-
-    $topic_interface = GETPOST('TICKET_PUBLIC_INTERFACE_TOPIC', 'alpha');
-    if (!empty($topic_interface)) {
-        $res = dolibarr_set_const($db, 'TICKET_PUBLIC_INTERFACE_TOPIC', $topic_interface, 'chaine', 0, '', $conf->entity);
-    } else {
-        $res = dolibarr_set_const($db, 'TICKET_PUBLIC_INTERFACE_TOPIC', '', 'chaine', 0, '', $conf->entity);
-    }
-    if (!$res > 0) {
-        $error++;
-    }
-
-    $text_home = GETPOST('TICKET_PUBLIC_TEXT_HOME', 'alpha');
-    if (!empty($text_home)) {
-        $res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HOME', $text_home, 'chaine', 0, '', $conf->entity);
-    } else {
-        $res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HOME', $langs->trans('TicketPublicInterfaceTextHome'), 'chaine', 0, '', $conf->entity);
-    }
-    if (!$res > 0) {
-        $error++;
-    }
-
-    $text_help = GETPOST('TICKET_PUBLIC_TEXT_HELP_MESSAGE', 'alpha');
-    if (!empty($text_help)) {
-        $res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HELP_MESSAGE', $text_help, 'chaine', 0, '', $conf->entity);
-    } else {
-        $res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HELP_MESSAGE', $langs->trans('TicketPublicPleaseBeAccuratelyDescribe'), 'chaine', 0, '', $conf->entity);
-    }
-    if (!$res > 0) {
-        $error++;
+    	$error++;
     }
 }
 
@@ -162,14 +127,11 @@ if ($action == 'setvarother') {
         $error++;
     }
 
-    if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
-    {
-    	$param_show_module_logo = GETPOST('TICKET_SHOW_MODULE_LOGO', 'alpha');
-    	$res = dolibarr_set_const($db, 'TICKET_SHOW_MODULE_LOGO', $param_show_module_logo, 'chaine', 0, '', $conf->entity);
-    	if (!$res > 0) {
-        	$error++;
-    	}
-    }
+   	$param_show_module_logo = GETPOST('TICKET_SHOW_COMPANY_LOGO', 'alpha');
+   	$res = dolibarr_set_const($db, 'TICKET_SHOW_COMPANY_LOGO', $param_show_module_logo, 'chaine', 0, '', $conf->entity);
+   	if (!$res > 0) {
+       	$error++;
+   	}
 
     if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
     {
@@ -179,12 +141,6 @@ if ($action == 'setvarother') {
 	        $error++;
 	    }
     }
-
-    $param_limit_view = GETPOST('TICKET_LIMIT_VIEW_ASSIGNED_ONLY', 'alpha');
-    $res = dolibarr_set_const($db, 'TICKET_LIMIT_VIEW_ASSIGNED_ONLY', $param_limit_view, 'chaine', 0, '', $conf->entity);
-    if (!$res > 0) {
-        $error++;
-    }
 }
 
 
@@ -238,8 +194,7 @@ print '<br><br>';
 
 if (! empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
 {
-
-    if (!$conf->use_javascript_ajax) {
+    if (empty($conf->use_javascript_ajax)) {
         print '<form method="post" action="' . $_SERVER['PHP_SELF'] . '" enctype="multipart/form-data" >';
         print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
         print '<input type="hidden" name="action" value="setvarother">';
@@ -349,16 +304,6 @@ if (! empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
         print "</tr>\n";
     }
 
-    // Url public interface
-    $url_interface = $conf->global->TICKET_URL_PUBLIC_INTERFACE;
-    print '<tr><td>' . $langs->trans("TicketUrlPublicInterfaceLabelAdmin") . '</label>';
-    print '</td><td>';
-    print '<input type="text" name="TICKET_URL_PUBLIC_INTERFACE" value="' . $conf->global->TICKET_URL_PUBLIC_INTERFACE . '" size="40" ></td>';
-    print '</td>';
-    print '<td align="center">';
-    print $form->textwithpicto('', $langs->trans("TicketUrlPublicInterfaceHelpAdmin"), 1, 'help');
-    print '</td></tr>';
-
     // Interface topic
     $url_interface = $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC;
     print '<tr><td>' . $langs->trans("TicketPublicInterfaceTopicLabelAdmin") . '</label>';
@@ -420,6 +365,16 @@ if (! empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
     print $form->textwithpicto('', $langs->trans("TicketNewEmailBodyHelp"), 1, 'help');
     print '</td></tr>';
 
+    // Url public interface
+    $url_interface = $conf->global->TICKET_URL_PUBLIC_INTERFACE;
+    print '<tr><td>' . $langs->trans("TicketUrlPublicInterfaceLabelAdmin") . '</label>';
+    print '</td><td>';
+    print '<input type="text" name="TICKET_URL_PUBLIC_INTERFACE" value="' . $conf->global->TICKET_URL_PUBLIC_INTERFACE . '" size="40" ></td>';
+    print '</td>';
+    print '<td align="center">';
+    print $form->textwithpicto('', $langs->trans("TicketUrlPublicInterfaceHelpAdmin"), 1, 'help');
+    print '</td></tr>';
+
     print '</table>';
 
     print '<div class="center"><input type="submit" class="button" value="' . $langs->trans("Save") . '"></div>';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 27a197a88fb..22c3bdb6785 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -540,6 +540,9 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti
 				$out=dol_string_nohtmltag($out);
 			}
 			break;
+		case 'restricthtml':		// Recommended for most html textarea
+			$out=dol_string_onlythesehtmltags($out, 0);
+			break;
 		case 'custom':
 			if (empty($filter)) return 'BadFourthParameterForGETPOST';
 			$out=filter_var($out, $filter, $options);

From ef15bbee4ab74b68c79a5d6976cae7b9f929c24b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Oct 2019 16:53:58 +0200
Subject: [PATCH 35/48] Increase delay of hide of popup so we have a chance to
 click on content

---
 htdocs/core/js/lib_foot.js.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index b0cd8f33258..a5bc992a1ca 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -50,7 +50,7 @@ if (empty($conf->dol_no_mouse_hover))
 {
 	print 'jQuery(".classfortooltip").tooltip({
 				show: { collision: "flipfit", effect:\'toggle\', delay:50 },
-				hide: { delay: 50 },
+				hide: { delay: 250 },
 				tooltipClass: "mytooltip",
 				content: function () {
                     console.log("Return title for popup");

From 8bf9afb7ca2542f448ed7c23226fe8db00e3a65b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 4 Oct 2019 19:41:35 +0200
Subject: [PATCH 36/48] FIX Attachement of linked files on ticket when sending
 a message

---
 htdocs/core/class/html.formmail.class.php |   2 +-
 htdocs/ticket/card.php                    |   4 +-
 htdocs/ticket/class/ticket.class.php      | 182 +++++++++++++---------
 3 files changed, 112 insertions(+), 76 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index b0cdcd23a96..99153f667e9 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -212,7 +212,7 @@ class FormMail extends Form
 	/**
 	 * Remove a file from the list of attached files (stored in SECTION array)
 	 *
-	 * @param  	string	$keytodelete     Key in file array (0, 1, 2, ...)
+	 * @param  	string	$keytodelete     Key index in file array (0, 1, 2, ...)
 	 * @return	void
 	 */
 	public function remove_attached_files($keytodelete)
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index eb47bc7044f..9ab82b0c3d8 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -371,7 +371,7 @@ if ($action == "assign_user" && GETPOST('btn_assign_user', 'aplha') && $user->ri
     $action = 'view';
 }
 
-if ($action == "add_message" && GETPOST('btn_add_message') && $user->rights->ticket->read) {
+if ($action == 'add_message' && GETPOSTISSET('btn_add_message') && $user->rights->ticket->read) {
     $ret = $object->newMessage($user, $action, (GETPOST('private_message', 'alpha') == "on" ? 1 : 0));
 
     if ($ret > 0) {
@@ -1290,10 +1290,8 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 			//$formticket->param['socid']=$object->fk_soc;
 			$formticket->param['returnurl']=$_SERVER["PHP_SELF"].'?track_id='.$object->track_id;
 
-
 			$formticket->withsubstit = 1;
 			$formticket->substit = $substitutionarray;
-
 			$formticket->showMessageForm('100%');
 			print '</div>';
 	    }
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 1ae0bb56aae..cdf2c14a500 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1602,13 +1602,16 @@ class Ticket extends CommonObject
     }
 
     /**
-     *  Add message into database
+     * Add message into database
      *
-     *  @param  User $user      	User that creates
-     *  @param  int  $notrigger 	0=launch triggers after, 1=disable triggers
-     *  @return int                 <0 if KO, Id of created object if OK
+     * @param User 	 $user      		  User that creates
+     * @param int  	 $notrigger 		  0=launch triggers after, 1=disable triggers
+	 * @param array	 $filename_list       List of files to attach (full path of filename on file system)
+	 * @param array	 $mimetype_list       List of MIME type of attached files
+	 * @param array	 $mimefilename_list   List of attached file name in message
+     * @return void
      */
-    public function createTicketMessage($user, $notrigger = 0)
+    public function createTicketMessage($user, $notrigger = 0, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array())
     {
         global $conf, $langs;
         $error = 0;
@@ -1633,7 +1636,7 @@ class Ticket extends CommonObject
         $actioncomm->code = 'TICKET_MSG';
         $actioncomm->socid = $this->socid;
         $actioncomm->label = $this->subject;
-        $actioncomm->note = $this->message;
+        $actioncomm->note_private = $this->message;
         $actioncomm->userassigned = array($user->id);
         $actioncomm->userownerid = $user->id;
         $actioncomm->datep = $now;
@@ -1641,6 +1644,19 @@ class Ticket extends CommonObject
         $actioncomm->elementtype = 'ticket';
         $actioncomm->fk_element = $this->id;
 
+        $attachedfiles = array();
+        $attachedfiles['paths'] = $filename_list;
+        $attachedfiles['names'] = $mimefilename_list;
+        $attachedfiles['mimes'] = $mimetype_list;
+        if (is_array($attachedfiles) && count($attachedfiles)>0) {
+        	$actioncomm->attachedfiles	= $attachedfiles;
+        }
+
+        if (! empty($mimefilename_list) && is_array($mimefilename_list))
+        {
+        	$actioncomm->note_private=dol_concatdesc($actioncomm->note_private, "\n".$langs->transnoentities("AttachedFiles").': '.join(';', $mimefilename_list));
+        }
+
         $actionid = $actioncomm->create($user);
         if ($actionid <= 0)
         {
@@ -2389,10 +2405,11 @@ class Ticket extends CommonObject
 
 
     /**
-     * Copy files into ticket directory
-     * Used for files linked into messages
+     * Copy files defined into $_SESSION array into the ticket directory of attached files.
+     * Used for files linked into messages.
+     * Files may be renamed during copy to avoid overwriting existing files.
      *
-     * @return	void
+     * @return	array		Array with final path/name/mime of files.
      */
     public function copyFilesForTicket()
     {
@@ -2422,23 +2439,42 @@ class Ticket extends CommonObject
         if (!dol_is_dir($destdir)) {
             dol_mkdir($destdir);
         }
+
+        $listofpaths = array();
+        $listofnames = array();
         foreach ($filename as $i => $val) {
-            $res = dol_move($filepath[$i], $destdir . '/' . $filename[$i]);
-            if (image_format_supported($destdir . '/' . $filename[$i]) == 1) {
+        	$destfile = $destdir . '/' . $filename[$i];
+        	// If destination file already exists, we add a suffix to avoid to overwrite
+        	if (is_file($destfile))
+        	{
+        		$now = dol_now();
+        		$destfile.='.'.dol_print_date($now, 'dayhourlog');
+        	}
+
+        	$res = dol_move($filepath[$i], $destfile, 0, 1);
+
+        	if (image_format_supported($destfile) == 1) {
                 // Create small thumbs for image (Ratio is near 16/9)
                 // Used on logon for example
-                $imgThumbSmall = vignette($destdir . '/' . $filename[$i], $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
+        		$imgThumbSmall = vignette($destfile, $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
                 // Create mini thumbs for image (Ratio is near 16/9)
                 // Used on menu or for setup page for example
-                $imgThumbMini = vignette($destdir . '/' . $filename[$i], $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
+        		$imgThumbMini = vignette($destfile, $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
             }
+
             $formmail->remove_attached_files($i);
+
+            // Fill array with new names
+            $listofpaths[$i] = $destfile;
+            $listofnames[$i] = basename($destfile);
         }
+
+        return array('listofpaths'=>$listofpaths, 'listofnames'=>$listofnames, 'listofmimes'=>$mimetype);
     }
 
 
     /**
-     * Add new message on a ticket (private area)
+     * Add new message on a ticket (private area). Can also send it be email if GETPOST('send_email', 'int') is set.
      *
      * @param   User    $user       User for action
      * @param   string  $action     Action string
@@ -2449,19 +2485,15 @@ class Ticket extends CommonObject
     {
         global $mysoc, $conf, $langs;
 
-        if (!class_exists('Contact')) {
-            include_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-        }
-
-        $contactstatic = new Contact($this->db);
-        $object = new Ticket($this->db);
-
         $error = 0;
 
+        $object = new Ticket($this->db);
+
         $ret = $object->fetch('', '', GETPOST('track_id', 'alpha'));
 
         $object->socid = $object->fk_soc;
         $object->fetch_thirdparty();
+
         if ($ret < 0) {
             $error++;
             array_push($this->errors, $langs->trans("ErrorTicketIsNotValid"));
@@ -2478,9 +2510,17 @@ class Ticket extends CommonObject
             $object->subject = GETPOST('subject', 'alphanohtml');
             $object->message = GETPOST("message", "none");
             $object->private = GETPOST("private_message", "alpha");
+
             $send_email = GETPOST('send_email', 'int');
 
-            $id = $object->createTicketMessage($user);
+            // Copy attached files (saved into $_SESSION) as linked files to ticket. Return array with final name used.
+            $resarray = $object->copyFilesForTicket();
+
+            $listofpaths = $resarray['listofpaths'];
+            $listofnames = $resarray['listofnames'];
+            $listofmimes = $resarray['listofmimes'];
+
+            $id = $object->createTicketMessage($user, 0, $listofpaths, $listofmimes, $listofnames);
             if ($id <= 0) {
                 $error++;
                 $this->errors = $object->error;
@@ -2491,24 +2531,27 @@ class Ticket extends CommonObject
             if (!$error && $id > 0) {
                 setEventMessages($langs->trans('TicketMessageSuccessfullyAdded'), null, 'mesgs');
 
+                //var_dump($_SESSION); var_dump($listofpaths);exit;
+
                 /*
-                 * Send email to linked contacts
+                 * Send emails to internal users (linked contacts)
                  */
                 if ($send_email > 0) {
                     // Retrieve internal contact datas
                     $internal_contacts = $object->getInfosTicketInternalContact();
+
                     $sendto = array();
                     if (is_array($internal_contacts) && count($internal_contacts) > 0) {
                         // altairis: set default subject
                         $label_title = empty($conf->global->MAIN_APPLICATION_TITLE) ? $mysoc->name : $conf->global->MAIN_APPLICATION_TITLE;
-                        $subject = GETPOST('subject') ? GETPOST('subject') : '[' . $label_title . '- ticket #' . $object->track_id . '] ' . $langs->trans('TicketNewMessage');
+                        $subject = GETPOST('subject', 'nohtml') ? GETPOST('subject', 'nohtml') : '[' . $label_title . '- ticket #' . $object->track_id . '] ' . $langs->trans('TicketNewMessage');
 
                         $message_intro = $langs->trans('TicketNotificationEmailBody', "#" . $object->id);
                         $message_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE;
 
                         $message = $langs->trans('TicketMessageMailIntroText');
                         $message .= "\n\n";
-                        $message .= GETPOST('message');
+                        $message .= GETPOST('message', 'restricthtml');
 
                         //  Coordonnées client
                         $message .= "\n\n";
@@ -2547,12 +2590,12 @@ class Ticket extends CommonObject
 
                         // altairis: dont try to send email if no recipient
                         if (!empty($sendto)) {
-                            $this->sendTicketMessageByEmail($subject, $message, '', $sendto);
+                        	$this->sendTicketMessageByEmail($subject, $message, '', $sendto, $listofpaths, $listofmimes, $listofnames);
                         }
                     }
 
                     /*
-                     * Email for externals users if not private
+                     * Send emails for externals users if not private (linked contacts)
                      */
                     if (empty($object->private)) {
                         // Retrieve email of all contacts (external)
@@ -2599,47 +2642,42 @@ class Ticket extends CommonObject
 
                             // If public interface is not enable, use link to internal page into mail
                             $url_public_ticket = (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) ?
-                                (!empty($conf->global->TICKET_URL_PUBLIC_INTERFACE) ?
-                                    $conf->global->TICKET_URL_PUBLIC_INTERFACE . '/view.php' :
-                                    dol_buildpath('/public/ticket/view.php', 2)
-                                    ) :
-                                dol_buildpath('/ticket/card.php', 2)
-                                ) . '?track_id=' . $object->track_id;
-                                $message .= "\n" . $langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer') . ' : ' . '<a href="' . $url_public_ticket . '">' . $object->track_id . '</a>' . "\n";
+                                (!empty($conf->global->TICKET_URL_PUBLIC_INTERFACE) ? $conf->global->TICKET_URL_PUBLIC_INTERFACE . '/view.php' : dol_buildpath('/public/ticket/view.php', 2)) :
+                                dol_buildpath('/ticket/card.php', 2)) . '?track_id=' . $object->track_id;
+                            $message .= "\n" . $langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer') . ' : ' . '<a href="' . $url_public_ticket . '">' . $object->track_id . '</a>' . "\n";
 
-                                // Build final message
-                                $message = $message_intro . $message;
+                            // Build final message
+                            $message = $message_intro . $message;
 
-                                // Add signature
-                                $message .= '<br>' . $message_signature;
+                            // Add signature
+                            $message .= '<br>' . $message_signature;
 
-                                if (!empty($object->origin_email)) {
-                                    $sendto[] = $object->origin_email;
-                                }
+                            if (!empty($object->origin_email)) {
+                            	$sendto[] = $object->origin_email;
+                            }
 
-                                if ($object->fk_soc > 0 && ! in_array($object->origin_email, $sendto)) {
-                                    $object->socid = $object->fk_soc;
-                                    $object->fetch_thirdparty();
-                                    if(!empty($object->thirdparty->email)) $sendto[] = $object->thirdparty->email;
-                                }
+                            if ($object->fk_soc > 0 && ! in_array($object->origin_email, $sendto)) {
+                            	$object->socid = $object->fk_soc;
+                            	$object->fetch_thirdparty();
+                            	if(!empty($object->thirdparty->email)) $sendto[] = $object->thirdparty->email;
+                            }
 
-                                // altairis: Add global email address reciepient
-                                if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS && !in_array($conf->global->TICKET_NOTIFICATION_EMAIL_TO, $sendto)) {
-                                    if(!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO)) $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
-                                }
+                            // altairis: Add global email address reciepient
+                            if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS && !in_array($conf->global->TICKET_NOTIFICATION_EMAIL_TO, $sendto)) {
+                            	if(!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO)) $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
+                            }
 
-                                // altairis: dont try to send email when no recipient
-                                if (!empty($sendto)) {
-                                    $this->sendTicketMessageByEmail($subject, $message, '', $sendto);
-                                }
+                            // altairis: dont try to send email when no recipient
+                            if (!empty($sendto)) {
+                            	$this->sendTicketMessageByEmail($subject, $message, '', $sendto, $listofpaths, $listofmimes, $listofnames);
+                            }
                         }
                     }
                 }
 
-                $object->copyFilesForTicket();
-
-                // Set status to "answered" if not set yet, only for internal users
-                if ($object->fk_statut < 3 && !$user->societe_id) {
+                // Set status to "answered" if not set yet, but only if internal user
+                if ($object->fk_statut < 3 && ! $user->socid)
+                {
                     $object->setStatut(3);
                 }
 
@@ -2658,13 +2696,16 @@ class Ticket extends CommonObject
     /**
      * Send ticket by email to linked contacts
      *
-     * @param string $subject          Email subject
-     * @param string $message          Email message
-     * @param int    $send_internal_cc Receive a copy on internal email ($conf->global->TICKET_NOTIFICATION_EMAIL_FROM)
-     * @param array  $array_receiver   Array of receiver. exemple array('name' => 'John Doe', 'email' => 'john@doe.com', etc...)
+     * @param string $subject          	  Email subject
+     * @param string $message          	  Email message
+     * @param int    $send_internal_cc 	  Receive a copy on internal email ($conf->global->TICKET_NOTIFICATION_EMAIL_FROM)
+     * @param array  $array_receiver   	  Array of receiver. exemple array('name' => 'John Doe', 'email' => 'john@doe.com', etc...)
+	 * @param array	 $filename_list       List of files to attach (full path of filename on file system)
+	 * @param array	 $mimetype_list       List of MIME type of attached files
+	 * @param array	 $mimefilename_list   List of attached file name in message
      * @return void
      */
-    public function sendTicketMessageByEmail($subject, $message, $send_internal_cc = 0, $array_receiver = array())
+    public function sendTicketMessageByEmail($subject, $message, $send_internal_cc = 0, $array_receiver = array(), $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array())
     {
         global $conf, $langs;
 
@@ -2690,15 +2731,12 @@ class Ticket extends CommonObject
 
         $from = $conf->global->TICKET_NOTIFICATION_EMAIL_FROM;
         if (is_array($array_receiver) && count($array_receiver) > 0) {
-            foreach ($array_receiver as $key => $receiver) {
-                // Create form object
-                include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-                $formmail = new FormMail($this->db);
-
-                $attachedfiles = $formmail->get_attached_files();
-                $filepath = $attachedfiles['paths'];
-                $filename = $attachedfiles['names'];
-                $mimetype = $attachedfiles['mimes'];
+            foreach ($array_receiver as $key => $receiver)
+            {
+                $deliveryreceipt = 0;
+                $filepath = $filename_list;
+                $filename = $mimefilename_list;
+                $mimetype = $mimetype_list;
 
                 $message_to_send = dol_nl2br($message);
 

From 827b1fe5d26ee68dc4e13bb8529430deffcdf71f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Oct 2019 11:17:09 +0200
Subject: [PATCH 37/48] Use small image instead of mini for preview on document
 list

---
 htdocs/core/class/html.formfile.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 8b6b10a4f5f..908fe200a97 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1285,14 +1285,14 @@ class FormFile
 						{
 						    if ($useinecm == 5 || $useinecm == 6)
 						    {
-						        $minifile=getImageFileNameForSize($file['name'], '');     // There is no thumb for ECM module and Media filemanager, so we use true image
+						        $smallfile=getImageFileNameForSize($file['name'], '');     // There is no thumb for ECM module and Media filemanager, so we use true image
 						    }
 						    else
 						    {
-						        $minifile=getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
+						        $smallfile=getImageFileNameForSize($file['name'], '_small'); // For new thumbs using same ext (in lower case however) than original
 						    }
-						    if (! dol_is_file($file['path'].'/'.$minifile)) $minifile=getImageFileNameForSize($file['name'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
-							//print $file['path'].'/'.$minifile.'<br>';
+						    if (! dol_is_file($file['path'].'/'.$smallfile)) $smallfile=getImageFileNameForSize($file['name'], '_small', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+							//print $file['path'].'/'.$smallfile.'<br>';
 
 							$urlforhref=getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity)?$object->entity:$conf->entity));
 							if (empty($urlforhref)) {
@@ -1301,7 +1301,7 @@ class FormFile
 							} else {
 								print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
 							}
-							print '<img class="photo" height="'.(($useinecm == 4 || $useinecm == 5 || $useinecm == 6)? '12' : $maxheightmini).'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
+							print '<img class="photo" height="'.(($useinecm == 4 || $useinecm == 5 || $useinecm == 6)? '12' : $maxheightmini).'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$smallfile).'" title="">';
 							print '</a>';
 						}
 						else print '&nbsp;';

From a06b1b9f3ff6e426018010a981aa4581a877cc88 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Oct 2019 11:43:28 +0200
Subject: [PATCH 38/48] Fix escaping chars

---
 htdocs/ticket/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 9ab82b0c3d8..2f3a79c59be 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -769,7 +769,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
         }
         if (!empty($object->origin_email)) {
         	$morehtmlref .= '<br>' . $langs->trans("CreatedBy") . ' : ';
-        	$morehtmlref .= $object->origin_email . ' <small>(' . $langs->trans("TicketEmailOriginIssuer") . ')</small>';
+        	$morehtmlref .= dol_escape_htmltag($object->origin_email) . ' <small>(' . $langs->trans("TicketEmailOriginIssuer") . ')</small>';
         }
 
         // Thirdparty

From 5c11a0d6cd76541439d633fa24b11fff62a809c4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Oct 2019 11:52:02 +0200
Subject: [PATCH 39/48] FIX access to public interface when origin email has an
 alias.

---
 htdocs/public/ticket/view.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index f756816874a..79552539834 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -38,6 +38,7 @@ if (!defined("NOLOGIN")) {
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticket.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ticket.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -100,7 +101,8 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
         $ret = $object->fetch('', '', $track_id);
         if ($ret && $object->dao->id > 0) {
         	// Check if emails provided is the one of author
-        	if ($object->dao->origin_email == $email)
+        	$emailofticket = CMailFile::getValidAddress($object->dao->origin_email, 2);
+        	if ($emailofticket == $email)
         	{
         		$display_ticket = true;
         		$_SESSION['email_customer'] = $email;
@@ -174,7 +176,6 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 
 
 
-
     	if (! $error)
     	{
     		$action = 'view_ticket';
@@ -226,7 +227,8 @@ llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 print '<div style="margin: 0 auto;" class="ticketpublicarea">';
 
 if ($action == "view_ticket" || $action == "presend" || $action == "close" || $action == "confirm_public_close") {
-    if ($display_ticket) {
+    if ($display_ticket)
+    {
         // Confirmation close
         if ($action == 'close') {
             print $form->formconfirm($_SERVER["PHP_SELF"] . "?track_id=" . $track_id, $langs->trans("CloseATicket"), $langs->trans("ConfirmCloseAticket"), "confirm_public_close", '', '', 1);
@@ -284,7 +286,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
             $fuser->fetch($object->dao->fk_user_create);
             print $fuser->getFullName($langs);
         } else {
-            print $object->dao->origin_email;
+            print dol_escape_htmltag($object->dao->origin_email);
         }
 
         print '</td></tr>';
@@ -370,7 +372,9 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
         // Message list
         print load_fiche_titre($langs->trans('TicketMessagesList'), '', 'messages@ticket');
         $object->viewTicketMessages(false, true, $object->dao);
-    } else {
+    }
+    else
+    {
         print '<div class="error">Not Allowed<br><a href="' . $_SERVER['PHP_SELF'] . '?track_id=' . $object->dao->track_id . '">' . $langs->trans('Back') . '</a></div>';
     }
 } else {

From 031c5523d476fee8e5b7bacdfd82bf9cca207483 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Oct 2019 11:52:30 +0200
Subject: [PATCH 40/48] NEW Add link to the public interface on the ticket
 card.

---
 htdocs/core/lib/ticket.lib.php | 39 ++++++++++++++++++++++++++++++++++
 htdocs/langs/en_US/ticket.lang |  2 ++
 htdocs/ticket/card.php         |  7 +++++-
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 81c51ade506..53afbe50dce 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -139,6 +139,45 @@ function ticket_prepare_head($object)
     return $head;
 }
 
+/**
+ * Return string with full Url. The file qualified is the one defined by relative path in $object->last_main_doc
+ *
+ * @param   Object	$object				Object
+ * @return	string						Url string
+ */
+function showDirectPublicLink($object)
+{
+	global $conf, $langs;
+
+	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+	$email = CMailFile::getValidAddress($object->origin_email, 2);
+	if ($email)
+	{
+		$url = dol_buildpath('/public/ticket/view.php', 3).'?track_id='.$object->track_id.'&email='.$email;
+	}
+
+	$out='';
+	if (empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
+	{
+		$out.= '<span class="opacitymedium">'.$langs->trans("PublicInterfaceNotEnabled").'</span>';
+	}
+	else
+	{
+		$out.= img_picto('', 'object_globe.png').' '.$langs->trans("TicketPublicAccess").':<br>';
+		if ($url)
+		{
+			$out.= '<input type="text" id="directpubliclink" class="quatrevingtpercent" value="'.$url.'">';
+			$out.= ajax_autoselect("directpubliclink", 0);
+		}
+		else
+		{
+			$out.= '<span class="opacitymedium">'.$langs->trans("TicketNotCreatedFromPublicInterface").'</span>';
+		}
+	}
+
+	return $out;
+}
+
 /**
  *     Generate a random id
  *
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index 80dda58ba59..4bc40e19555 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -226,6 +226,8 @@ TicketConfirmChangeStatus=Confirm the status change: %s ?
 TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
+TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
+PublicInterfaceNotEnabled=Public interface was not enabled
 
 #
 # Logs
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 8e8add64b38..690c01644e0 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -769,7 +769,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
         }
         if (!empty($object->origin_email)) {
         	$morehtmlref .= '<br>' . $langs->trans("CreatedBy") . ' : ';
-        	$morehtmlref .= $object->origin_email . ' <small>(' . $langs->trans("TicketEmailOriginIssuer") . ')</small>';
+        	$morehtmlref .= dol_escape_htmltag($object->origin_email) . ' <small>(' . $langs->trans("TicketEmailOriginIssuer") . ')</small>';
         }
 
         // Thirdparty
@@ -983,6 +983,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
         }
         print '</td>';
         print '</tr>';
+
         if (GETPOST('set', 'alpha') == 'properties' && $user->rights->ticket->write) {
             print '<tr>';
             // Type
@@ -1212,6 +1213,10 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 			$linktoelem = $form->showLinkToObjectBlock($object, null, array('ticket'));
 			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
+			// Show direct link to public interface
+			print '<br><!-- Link to public interface -->'."\n";
+			print showDirectPublicLink($object).'<br>';
+
 			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 			// List of actions on element

From 083db124907d17dec1c81bcb30f8665083437924 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Oct 2019 11:52:02 +0200
Subject: [PATCH 41/48] FIX access to public interface when origin email has an
 alias.

---
 htdocs/public/ticket/view.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index cdbd3abad19..47dc038120f 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -38,6 +38,7 @@ if (!defined("NOLOGIN")) {
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticket.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ticket.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -100,7 +101,8 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
         $ret = $object->fetch('', '', $track_id);
         if ($ret && $object->dao->id > 0) {
         	// Check if emails provided is the one of author
-        	if ($object->dao->origin_email == $email)
+        	$emailofticket = CMailFile::getValidAddress($object->dao->origin_email, 2);
+        	if ($emailofticket == $email)
         	{
         		$display_ticket = true;
         		$_SESSION['email_customer'] = $email;
@@ -174,7 +176,6 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 
 
 
-
     	if (! $error)
     	{
     		$action = 'view_ticket';
@@ -226,7 +227,8 @@ llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 print '<div style="margin: 0 auto;" class="ticketpublicarea">';
 
 if ($action == "view_ticket" || $action == "presend" || $action == "close" || $action == "confirm_public_close") {
-    if ($display_ticket) {
+    if ($display_ticket)
+    {
         // Confirmation close
         if ($action == 'close') {
             print $form->formconfirm($_SERVER["PHP_SELF"] . "?track_id=" . $track_id, $langs->trans("CloseATicket"), $langs->trans("ConfirmCloseAticket"), "confirm_public_close", '', '', 1);
@@ -284,7 +286,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
             $fuser->fetch($object->dao->fk_user_create);
             print $fuser->getFullName($langs);
         } else {
-            print $object->dao->origin_email;
+            print dol_escape_htmltag($object->dao->origin_email);
         }
 
         print '</td></tr>';
@@ -370,7 +372,9 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
         // Message list
         print load_fiche_titre($langs->trans('TicketMessagesList'), '', 'messages@ticket');
         $object->viewTicketMessages(false, true, $object->dao);
-    } else {
+    }
+    else
+    {
         print '<div class="error">Not Allowed<br><a href="' . $_SERVER['PHP_SELF'] . '?track_id=' . $object->dao->track_id . '">' . $langs->trans('Back') . '</a></div>';
     }
 } else {

From b053663fe61e68f6be96fabbc7978b644712da07 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Oct 2019 13:13:11 +0200
Subject: [PATCH 42/48] Look and feel v11

---
 htdocs/ticket/card.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 690c01644e0..61304aaf561 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1195,7 +1195,10 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 			}
 	        print '</div>'."\n";
 		}
-
+		else
+		{
+			print '<br>';
+		}
 
 		// Select mail models is same action as presend
 		if (GETPOST('modelselected')) {
@@ -1261,7 +1264,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 		    foreach ($substitutionarray as $key => $val) {
 		        $help.=$key.' -> '.$langs->trans($val).'<br>';
 		    }
-		    $morehtmlright.=$form->textwithpicto($langs->trans("TicketMessageSubstitutionReplacedByGenericValues"), $help);
+		    $morehtmlright.=$form->textwithpicto('<span class="opacitymedium">'.$langs->trans("TicketMessageSubstitutionReplacedByGenericValues").'</span>', $help, 1, 'helpclickable', '', 0, 3, 'helpsubstitution');
 
 			print '<div>';
 			print load_fiche_titre($langs->trans('TicketAddMessage'), $morehtmlright, 'messages@ticket');

From c36d49a8c36189bfd2d2ef2047a0ca0246e7ac86 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Oct 2019 14:15:14 +0200
Subject: [PATCH 43/48] FIX escape email alias

---
 htdocs/core/class/html.formticket.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index ba5d2f37293..49c7a28f1e1 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -939,13 +939,13 @@ class FormTicket
                 if (is_array($contacts) && count($contacts) > 0) {
                     foreach ($contacts as $key => $info_sendto) {
                         if ($info_sendto['email'] != '') {
-                            $sendto[] = dol_escape_htmltag(trim($info_sendto['firstname'] . " " . $info_sendto['lastname']) . " <" . $info_sendto['email'] . "> (" . $info_sendto['libelle'] . ")");
+                        	$sendto[] = dol_escape_htmltag(trim($info_sendto['firstname'] . " " . $info_sendto['lastname']) . " <" . $info_sendto['email'] . ">")." <small>(" . dol_escape_htmltag($info_sendto['libelle']) . ")</small>";
                         }
                     }
                 }
 
                 if ($ticketstat->origin_email && !in_array($this->dao->origin_email, $sendto)) {
-                    $sendto[] = $ticketstat->origin_email . "(origin)";
+                	$sendto[] = dol_escape_htmltag($ticketstat->origin_email) . " <small>(".$langs->trans("TicketEmailOriginIssuer").")</small>";
                 }
 
                 if ($ticketstat->fk_soc > 0) {
@@ -953,12 +953,12 @@ class FormTicket
                     $ticketstat->fetch_thirdparty();
 
                     if (is_array($ticketstat->thirdparty->email) && !in_array($ticketstat->thirdparty->email, $sendto)) {
-                        $sendto[] = $ticketstat->thirdparty->email . '(' . $langs->trans('Customer') . ')';
+                        $sendto[] = $ticketstat->thirdparty->email . ' <small>(' . $langs->trans('Customer') . ')</small>';
                     }
                 }
 
                 if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS) {
-                    $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO . '(generic email)';
+                    $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO . ' <small>(generic email)</small>';
                 }
 
                 // Print recipient list

From 7c685bc76fb27c60c729cc85f7208d43a6fa79fb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Oct 2019 14:25:20 +0200
Subject: [PATCH 44/48] FIX Bad list of ticket on public interface for ticket
 emailcollector

---
 htdocs/public/ticket/list.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 1ec348c89a9..523370f9b21 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -37,6 +37,7 @@ if (!defined("NOLOGIN")) {
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticket.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ticket.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -95,7 +96,8 @@ if ($action == "view_ticketlist") {
     	$ret = $object->fetch('', '', $track_id);
 
         if ($ret && $object->id > 0) {
-            // vérifie si l'adresse email est bien dans les contacts du ticket
+
+        	// vérifie si l'adresse email est bien dans les contacts du ticket
             $contacts = $object->liste_contact(-1, 'external');
             foreach ($contacts as $contact) {
                 if ($contact['email'] == $email) {
@@ -124,7 +126,9 @@ if ($action == "view_ticketlist") {
                     $_SESSION['track_id_customer'] = $track_id;
                 }
             }
-            if ($email == $object->origin_email) {
+
+            $emailorigin = CMailFile::getValidAddress($object->origin_email, 2);
+            if ($email == $emailorigin) {
                 $display_ticket_list = true;
                 $_SESSION['email_customer'] = $email;
                 $_SESSION['track_id_customer'] = $track_id;
@@ -638,7 +642,7 @@ if ($action == "view_ticketlist")
 
                     // Statut
                     if (!empty($arrayfields['t.fk_statut']['checked'])) {
-                        print '<td>';
+                        print '<td class="nowraponall">';
                         $object->fk_statut = $obj->fk_statut;
                         print $object->getLibStatut(2);
                         print '</td>';

From e90234c2bc2e91d396d5bd160b337f8ecb71fc8c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Oct 2019 14:15:14 +0200
Subject: [PATCH 45/48] FIX escape email alias

---
 htdocs/core/class/html.formticket.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index cdb595883f3..747b2dbdf8b 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -939,13 +939,13 @@ class FormTicket
                 if (is_array($contacts) && count($contacts) > 0) {
                     foreach ($contacts as $key => $info_sendto) {
                         if ($info_sendto['email'] != '') {
-                            $sendto[] = dol_escape_htmltag(trim($info_sendto['firstname'] . " " . $info_sendto['lastname']) . " <" . $info_sendto['email'] . "> (" . $info_sendto['libelle'] . ")");
+                        	$sendto[] = dol_escape_htmltag(trim($info_sendto['firstname'] . " " . $info_sendto['lastname']) . " <" . $info_sendto['email'] . ">")." <small>(" . dol_escape_htmltag($info_sendto['libelle']) . ")</small>";
                         }
                     }
                 }
 
                 if ($ticketstat->origin_email && !in_array($this->dao->origin_email, $sendto)) {
-                    $sendto[] = $ticketstat->origin_email . "(origin)";
+                	$sendto[] = dol_escape_htmltag($ticketstat->origin_email) . " <small>(".$langs->trans("TicketEmailOriginIssuer").")</small>";
                 }
 
                 if ($ticketstat->fk_soc > 0) {
@@ -953,12 +953,12 @@ class FormTicket
                     $ticketstat->fetch_thirdparty();
 
                     if (is_array($ticketstat->thirdparty->email) && !in_array($ticketstat->thirdparty->email, $sendto)) {
-                        $sendto[] = $ticketstat->thirdparty->email . '(' . $langs->trans('Customer') . ')';
+                        $sendto[] = $ticketstat->thirdparty->email . ' <small>(' . $langs->trans('Customer') . ')</small>';
                     }
                 }
 
                 if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS) {
-                    $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO . '(generic email)';
+                    $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO . ' <small>(generic email)</small>';
                 }
 
                 // Print recipient list

From 3e5cd877b8e3a1c29d0023006c191852d194b590 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Oct 2019 14:25:20 +0200
Subject: [PATCH 46/48] FIX Bad list of ticket on public interface for ticket
 emailcollector

---
 htdocs/public/ticket/list.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 5e1ce07e098..078fe46b7ac 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -37,6 +37,7 @@ if (!defined("NOLOGIN")) {
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticket.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ticket.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -95,7 +96,8 @@ if ($action == "view_ticketlist") {
     	$ret = $object->fetch('', '', $track_id);
 
         if ($ret && $object->id > 0) {
-            // vérifie si l'adresse email est bien dans les contacts du ticket
+
+        	// vérifie si l'adresse email est bien dans les contacts du ticket
             $contacts = $object->liste_contact(-1, 'external');
             foreach ($contacts as $contact) {
                 if ($contact['email'] == $email) {
@@ -124,7 +126,9 @@ if ($action == "view_ticketlist") {
                     $_SESSION['track_id_customer'] = $track_id;
                 }
             }
-            if ($email == $object->origin_email) {
+
+            $emailorigin = CMailFile::getValidAddress($object->origin_email, 2);
+            if ($email == $emailorigin) {
                 $display_ticket_list = true;
                 $_SESSION['email_customer'] = $email;
                 $_SESSION['track_id_customer'] = $track_id;
@@ -638,7 +642,7 @@ if ($action == "view_ticketlist")
 
                     // Statut
                     if (!empty($arrayfields['t.fk_statut']['checked'])) {
-                        print '<td>';
+                        print '<td class="nowraponall">';
                         $object->fk_statut = $obj->fk_statut;
                         print $object->getLibStatut(2);
                         print '</td>';

From 7f5ccf4b8e5e1a6e13f656a0644ca535f70ce022 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Oct 2019 19:27:14 +0200
Subject: [PATCH 47/48] Remove google+

---
 htdocs/admin/system/about.php    | 1 -
 htdocs/core/lib/payments.lib.php | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index a941c89b994..706bcd9912a 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -160,7 +160,6 @@ print '<ul>';
 
 print '<li><a href="https://facebook.com/dolibarr" target="_blank" rel="external">FaceBook</a></li>';
 print '<li><a href="https://twitter.com/dolibarr" target="_blank" rel="external">Twitter</a></li>';
-print '<li><a href="https://plus.google.com/+DolibarrOrg" target="_blank" rel="external">Google Plus page</a></li>';
 
 print '</ul>';
 
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index db5740d277b..e78f777eb56 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -130,7 +130,7 @@ function showOnlinePaymentUrl($type, $ref)
 	// Load translation files required by the page
     $langs->loadLangs(array('payment', 'paybox'));
 
-	$servicename='Online';
+	$servicename=$langs->transnoentitiesnoconve('Online'):;
 
 	$out = img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'<br>';
 	$url = getOnlinePaymentUrl(0, $type, $ref);

From ac8837d01fb1f728f768045667ac47c4ed36d042 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Oct 2019 19:28:00 +0200
Subject: [PATCH 48/48] Fix url

---
 htdocs/core/lib/payments.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index e78f777eb56..f2b701b371f 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -125,12 +125,12 @@ function getValidOnlinePaymentMethods($paymentmethod = '')
  */
 function showOnlinePaymentUrl($type, $ref)
 {
-	global $conf, $langs;
+	global $langs;
 
 	// Load translation files required by the page
     $langs->loadLangs(array('payment', 'paybox'));
 
-	$servicename=$langs->transnoentitiesnoconve('Online'):;
+	$servicename=$langs->transnoentitiesnoconv('Online');
 
 	$out = img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'<br>';
 	$url = getOnlinePaymentUrl(0, $type, $ref);